X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=9f1f532cc26a617713f16146f4a1cffdfd3a1de0;hb=56dfaffd65d96d27a74c906c2201fd392e06f154;hp=2a46d0ea3848211eee48ad3644a5e0632ca6b9f2;hpb=bec18cb3a1dcbc70b0257a367091c9a5948da6f6;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 2a46d0e..9f1f532 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -72,7 +72,10 @@ import EXCEPTION	( throwDyn )
 import Monad		( when )
 #ifdef mingw32_TARGET_OS
 import Data.List	( isPrefixOf )
+#else
+import Util		( split )
 #endif
+
 import Char		( isDigit, isUpper )
 import Outputable
 import System.IO        ( hPutStrLn, stderr )
@@ -151,10 +154,11 @@ data DynFlag
    | Opt_AllowIncoherentInstances
    | Opt_MonomorphismRestriction
    | Opt_MonoPatBinds
+   | Opt_ExtendedDefaultRules		-- Use GHC's extended rules for defaulting
    | Opt_GlasgowExts
    | Opt_FFI
-   | Opt_PArr			       -- syntactic support for parallel arrays
-   | Opt_Arrows			       -- Arrow-notation syntax
+   | Opt_PArr				-- Syntactic support for parallel arrays
+   | Opt_Arrows				-- Arrow-notation syntax
    | Opt_TH
    | Opt_ImplicitParams
    | Opt_Generics
@@ -1012,6 +1016,7 @@ fFlags = [
   ( "bang-patterns",	  		Opt_BangPatterns ),
   ( "monomorphism-restriction",		Opt_MonomorphismRestriction ),
   ( "mono-pat-binds",			Opt_MonoPatBinds ),
+  ( "extended-default-rules",		Opt_ExtendedDefaultRules ),
   ( "implicit-params",			Opt_ImplicitParams ),
   ( "allow-overlapping-instances", 	Opt_AllowOverlappingInstances ),
   ( "allow-undecidable-instances", 	Opt_AllowUndecidableInstances ),
@@ -1037,8 +1042,7 @@ glasgowExtsFlags = [
   Opt_GlasgowExts, 
   Opt_FFI, 
   Opt_ImplicitParams, 
-  Opt_ScopedTypeVariables,
-  Opt_BangPatterns ]
+  Opt_ScopedTypeVariables ]
 
 isFFlag f = f `elem` (map fst fFlags)
 getFFlag f = fromJust (lookup f fFlags)