X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=20376f05dc3d7f4b7622e44818290600db7f83a1;hb=311b1cdfc9b1c311cc53482c461c18cba8885b2a;hp=0a361a478fb5fdaf6abf8181aeb31190222355d8;hpb=ee565d464248078a4f2d46f98667aa4fcdc56db4;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 0a361a4..20376f0 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -39,13 +39,14 @@ module DynFlags (
 	getVerbFlag,
 	updOptLevel,
 	setTmpDir,
+	setPackageName,
 	
 	-- parsing DynFlags
 	parseDynamicFlags,
         allFlags,
 
 	-- misc stuff
-	machdepCCOpts, picCCOpts,
+	machdepCCOpts, picCCOpts
   ) where
 
 #include "HsVersions.h"
@@ -68,20 +69,20 @@ import UniqFM           ( UniqFM )
 import Util		( notNull, splitLongestPrefix, normalisePath )
 import Maybes		( fromJust, orElse )
 import SrcLoc           ( SrcSpan )
+import Outputable
+import {-# SOURCE #-} ErrUtils ( Severity(..), Message, mkLocMessage )
 
-import DATA_IOREF	( readIORef )
-import EXCEPTION	( throwDyn )
-import Monad		( when )
+import Data.IORef	( readIORef )
+import Control.Exception ( throwDyn )
+import Control.Monad	( when )
 #ifdef mingw32_TARGET_OS
 import Data.List	( isPrefixOf )
 #else
 import Util		( split )
 #endif
 
-import Char		( isDigit, isUpper )
-import Outputable
+import Data.Char	( isDigit, isUpper )
 import System.IO        ( hPutStrLn, stderr )
-import {-# SOURCE #-} ErrUtils ( Severity(..), Message, mkLocMessage )
 
 -- -----------------------------------------------------------------------------
 -- DynFlags
@@ -167,6 +168,7 @@ data DynFlag
    | Opt_ImplicitPrelude 
    | Opt_ScopedTypeVariables
    | Opt_BangPatterns
+   | Opt_IndexedTypes
 
    -- optimisation opts
    | Opt_Strictness
@@ -185,7 +187,7 @@ data DynFlag
    -- misc opts
    | Opt_Cpp
    | Opt_Pp
-   | Opt_RecompChecking
+   | Opt_ForceRecomp
    | Opt_DryRun
    | Opt_DoAsmMangling
    | Opt_ExcessPrecision
@@ -194,6 +196,8 @@ data DynFlag
    | Opt_SplitObjs
    | Opt_StgStats
    | Opt_HideAllPackages
+   | Opt_PrintBindResult
+   | Opt_Haddock
 
    -- keeping stuff
    | Opt_KeepHiDiffs
@@ -302,7 +306,6 @@ data HscTarget
   = HscC
   | HscAsm
   | HscJava
-  | HscILX
   | HscInterpreted
   | HscNothing
   deriving (Eq, Show)
@@ -405,7 +408,6 @@ defaultDynFlags =
         pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
 	
 	flags = [ 
-    	    Opt_RecompChecking,
     	    Opt_ReadUserPackageConf,
     
 	    Opt_MonoPatBinds, 	-- Experimentally, I'm making this non-standard
@@ -430,8 +432,10 @@ defaultDynFlags =
     
     	    -- and the default no-optimisation options:
     	    Opt_IgnoreInterfacePragmas,
-    	    Opt_OmitInterfacePragmas
+    	    Opt_OmitInterfacePragmas,
     
+	    -- on by default:
+	    Opt_PrintBindResult
                ] ++ standardWarnings,
                
         log_action = \severity srcSpan style msg -> 
@@ -810,7 +814,6 @@ dynamic_flags = [
   ,  ( "F"		, NoArg  (setDynFlag Opt_Pp))
   ,  ( "#include"	, HasArg (addCmdlineHCInclude) )
   ,  ( "v"		, OptIntSuffix setVerbosity )
-
         ------- Specific phases  --------------------------------------------
   ,  ( "pgmL"           , HasArg (upd . setPgmL) )  
   ,  ( "pgmP"           , HasArg (upd . setPgmP) )  
@@ -871,15 +874,16 @@ dynamic_flags = [
 	------- Miscellaneous ----------------------------------------------
   ,  ( "no-hs-main"     , NoArg (setDynFlag Opt_NoHsMain))
   ,  ( "main-is"   	, SepArg setMainIs )
+  ,  ( "haddock"	, NoArg (setDynFlag Opt_Haddock) )
 
-	------- recompilation checker --------------------------------------
-  ,  ( "recomp"		, NoArg (setDynFlag   Opt_RecompChecking) )
-  ,  ( "no-recomp"  	, NoArg (unSetDynFlag Opt_RecompChecking) )
+	------- recompilation checker (DEPRECATED, use -fforce-recomp) -----
+  ,  ( "recomp"		, NoArg (unSetDynFlag Opt_ForceRecomp) )
+  ,  ( "no-recomp"  	, NoArg (setDynFlag   Opt_ForceRecomp) )
 
         ------- Packages ----------------------------------------------------
   ,  ( "package-conf"   , HasArg extraPkgConf_ )
   ,  ( "no-user-package-conf", NoArg (unSetDynFlag Opt_ReadUserPackageConf) )
-  ,  ( "package-name"   , HasArg setPackageName )
+  ,  ( "package-name"   , HasArg (upd . setPackageName) )
   ,  ( "package"        , HasArg exposePackage )
   ,  ( "hide-package"   , HasArg hidePackage )
   ,  ( "hide-all-packages", NoArg (setDynFlag Opt_HideAllPackages) )
@@ -937,7 +941,7 @@ dynamic_flags = [
   ,  ( "dcore-lint",       	 NoArg (setDynFlag Opt_DoCoreLinting))
   ,  ( "dstg-lint",        	 NoArg (setDynFlag Opt_DoStgLinting))
   ,  ( "dcmm-lint",		 NoArg (setDynFlag Opt_DoCmmLinting))
-  ,  ( "dshow-passes",           NoArg (do unSetDynFlag Opt_RecompChecking
+  ,  ( "dshow-passes",           NoArg (do setDynFlag Opt_ForceRecomp
 				           setVerbosity (Just 2)) )
   ,  ( "dfaststring-stats",	 NoArg (setDynFlag Opt_D_faststring_stats))
 
@@ -974,7 +978,6 @@ dynamic_flags = [
   ,  ( "fasm",		AnySuffix (\_ -> setTarget HscAsm) )
   ,  ( "fvia-c",	NoArg (setTarget HscC) )
   ,  ( "fvia-C",	NoArg (setTarget HscC) )
-  ,  ( "filx",		NoArg (setTarget HscILX) )
 
   ,  ( "fglasgow-exts",    NoArg (mapM_ setDynFlag   glasgowExtsFlags) )
   ,  ( "fno-glasgow-exts", NoArg (mapM_ unSetDynFlag glasgowExtsFlags) )
@@ -1014,6 +1017,7 @@ fFlags = [
   ( "implicit-prelude",  		Opt_ImplicitPrelude ),
   ( "scoped-type-variables",  		Opt_ScopedTypeVariables ),
   ( "bang-patterns",	  		Opt_BangPatterns ),
+  ( "indexed-types",	  		Opt_IndexedTypes ),
   ( "monomorphism-restriction",		Opt_MonomorphismRestriction ),
   ( "mono-pat-binds",			Opt_MonoPatBinds ),
   ( "extended-default-rules",		Opt_ExtendedDefaultRules ),
@@ -1035,14 +1039,18 @@ fFlags = [
   ( "unbox-strict-fields",		Opt_UnboxStrictFields ),
   ( "dicts-cheap",			Opt_DictsCheap ),
   ( "excess-precision",			Opt_ExcessPrecision ),
-  ( "asm-mangling",			Opt_DoAsmMangling )
+  ( "asm-mangling",			Opt_DoAsmMangling ),
+  ( "print-bind-result",		Opt_PrintBindResult ),
+  ( "force-recomp",			Opt_ForceRecomp )
   ]
 
+
 glasgowExtsFlags = [ 
   Opt_GlasgowExts, 
   Opt_FFI, 
   Opt_ImplicitParams, 
-  Opt_ScopedTypeVariables ]
+  Opt_ScopedTypeVariables,
+  Opt_IndexedTypes ]
 
 isFFlag f = f `elem` (map fst fFlags)
 getFFlag f = fromJust (lookup f fFlags)
@@ -1072,7 +1080,7 @@ unSetDynFlag f = upd (\dfs -> dopt_unset dfs f)
 
 setDumpFlag :: DynFlag -> OptKind DynP
 setDumpFlag dump_flag 
-  = NoArg (unSetDynFlag Opt_RecompChecking >> setDynFlag dump_flag)
+  = NoArg (setDynFlag Opt_ForceRecomp >> setDynFlag dump_flag)
 	-- Whenver we -ddump, switch off the recompilation checker,
 	-- else you don't see the dump!
 
@@ -1089,20 +1097,20 @@ hidePackage p =
   upd (\s -> s{ packageFlags = HidePackage p : packageFlags s })
 ignorePackage p = 
   upd (\s -> s{ packageFlags = IgnorePackage p : packageFlags s })
+
 setPackageName p
   | Nothing <- unpackPackageId pid
   = throwDyn (CmdLineError ("cannot parse \'" ++ p ++ "\' as a package identifier"))
   | otherwise
-  = upd (\s -> s{ thisPackage = pid })
+  = \s -> s{ thisPackage = pid }
   where
         pid = stringToPackageId p
 
--- we can only switch between HscC, HscAsmm, and HscILX with dynamic flags 
+-- we can only switch between HscC, and HscAsmm with dynamic flags 
 -- (-fvia-C, -fasm, -filx respectively).
 setTarget l = upd (\dfs -> case hscTarget dfs of
 					HscC   -> dfs{ hscTarget = l }
 					HscAsm -> dfs{ hscTarget = l }
-					HscILX -> dfs{ hscTarget = l }
 					_      -> dfs)
 
 setOptLevel :: Int -> DynFlags -> DynFlags