X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=1b39d5ded408fb50463759bd05cd1dae1cbe67ec;hb=923ee9d360ed15331ac6faf8a6b4aca334fc0cee;hp=70229643366010f477654b08a77685293bbbdf5e;hpb=b3a0711bf88db2894261e3666b689b40371ddc48;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 7022964..1b39d5d 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -17,7 +17,7 @@ module DynFlags (
 	-- Dynamic flags
 	DynFlag(..),
 	DynFlags(..),
-	HscTarget(..), isObjectTarget,
+	HscTarget(..), isObjectTarget, defaultObjectTarget,
 	GhcMode(..), isOneShot,
 	GhcLink(..), isNoLink,
 	PackageFlag(..),
@@ -139,6 +139,7 @@ data DynFlag
    | Opt_WarnIsError		-- -Werror; makes warnings fatal
    | Opt_WarnDuplicateExports
    | Opt_WarnHiShadows
+   | Opt_WarnImplicitPrelude
    | Opt_WarnIncompletePatterns
    | Opt_WarnIncompletePatternsRecUpd
    | Opt_WarnMissingFields
@@ -174,7 +175,7 @@ data DynFlag
    | Opt_ImplicitPrelude 
    | Opt_ScopedTypeVariables
    | Opt_BangPatterns
-   | Opt_IndexedTypes
+   | Opt_TypeFamilies
    | Opt_OverloadedStrings
 
    -- optimisation opts
@@ -192,6 +193,7 @@ data DynFlag
    | Opt_CaseMerge
    | Opt_UnboxStrictFields
    | Opt_DictsCheap
+   | Opt_RewriteRules
 
    -- misc opts
    | Opt_Cpp
@@ -208,6 +210,7 @@ data DynFlag
    | Opt_PrintBindResult
    | Opt_Haddock
    | Opt_Hpc_No_Auto
+   | Opt_BreakOnException
 
    -- keeping stuff
    | Opt_KeepHiDiffs
@@ -365,7 +368,11 @@ data PackageFlag
   | IgnorePackage  String
   deriving Eq
 
-defaultHscTarget
+defaultHscTarget = defaultObjectTarget
+
+-- | the 'HscTarget' value corresponding to the default way to create
+-- object files on the current platform.
+defaultObjectTarget
   | cGhcWithNativeCodeGen == "YES" 	=  HscAsm
   | otherwise				=  HscC
 
@@ -560,12 +567,16 @@ optLevelFlags :: [([Int], DynFlag)]
 optLevelFlags
   = [ ([0],	Opt_IgnoreInterfacePragmas)
     , ([0],     Opt_OmitInterfacePragmas)
+
     , ([1,2],	Opt_IgnoreAsserts)
+    , ([1,2],	Opt_RewriteRules)	-- Off for -O0; see Note [Scoping for Builtin rules]
+					-- 		in PrelRules
     , ([1,2],	Opt_DoEtaReduction)
     , ([1,2],	Opt_CaseMerge)
     , ([1,2],	Opt_Strictness)
     , ([1,2],	Opt_CSE)
     , ([1,2],	Opt_FullLaziness)
+
     , ([2],	Opt_LiberateCase)
     , ([2],	Opt_SpecConstr)
 
@@ -1015,6 +1026,7 @@ dynamic_flags = [
 fFlags = [
   ( "warn-duplicate-exports",    	Opt_WarnDuplicateExports ),
   ( "warn-hi-shadowing",         	Opt_WarnHiShadows ),
+  ( "warn-implicit-prelude",            Opt_WarnImplicitPrelude ),
   ( "warn-incomplete-patterns",  	Opt_WarnIncompletePatterns ),
   ( "warn-incomplete-record-updates",  	Opt_WarnIncompletePatternsRecUpd ),
   ( "warn-missing-fields",       	Opt_WarnMissingFields ),
@@ -1040,7 +1052,7 @@ fFlags = [
   ( "scoped-type-variables",  		Opt_ScopedTypeVariables ),
   ( "bang-patterns",	  		Opt_BangPatterns ),
   ( "overloaded-strings",		Opt_OverloadedStrings ),
-  ( "indexed-types",	  		Opt_IndexedTypes ),
+  ( "type-families",	  		Opt_TypeFamilies ),
   ( "monomorphism-restriction",		Opt_MonomorphismRestriction ),
   ( "mono-pat-binds",			Opt_MonoPatBinds ),
   ( "extended-default-rules",		Opt_ExtendedDefaultRules ),
@@ -1067,7 +1079,9 @@ fFlags = [
   ( "asm-mangling",			Opt_DoAsmMangling ),
   ( "print-bind-result",		Opt_PrintBindResult ),
   ( "force-recomp",			Opt_ForceRecomp ),
-  ( "hpc-no-auto",			Opt_Hpc_No_Auto )
+  ( "hpc-no-auto",			Opt_Hpc_No_Auto ),
+  ( "rewrite-rules",			Opt_RewriteRules ),
+  ( "break-on-exception",               Opt_BreakOnException )
   ]
 
 
@@ -1076,7 +1090,7 @@ glasgowExtsFlags = [
   Opt_FFI, 
   Opt_ImplicitParams, 
   Opt_ScopedTypeVariables,
-  Opt_IndexedTypes ]
+  Opt_TypeFamilies ]
 
 isFFlag f = f `elem` (map fst fFlags)
 getFFlag f = fromJust (lookup f fFlags)