X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=85a70127b08c20dbda2d9af33b9cc40d2956a1da;hb=9eb79d53316804b4c384b5084825112c48f1bbc4;hp=a5c1ab8b5f76e8a6209fa8759f962e194a15d02a;hpb=d0f6db5b0cf1189d84e292aeca350211f3b810dd;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index a5c1ab8..85a7012 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -183,6 +183,28 @@ data DynFlag
    | Opt_RecordPuns
    | Opt_GADTs
    | Opt_RelaxedPolyRec			-- -X=RelaxedPolyRec
+   | Opt_TypeSynonymInstances
+   | Opt_FlexibleContexts
+   | Opt_FlexibleInstances
+   | Opt_MultiParamTypeClasses
+   | Opt_FunctionalDependencies
+   | Opt_UnicodeSyntax
+   | Opt_PolymorphicComponents
+   | Opt_ExistentialQuantification
+   | Opt_MagicHash
+   | Opt_EmptyDataDecls
+   | Opt_KindSignatures
+   | Opt_PatternSignatures
+   | Opt_ParallelListComp
+   | Opt_GeneralizedNewtypeDeriving
+   | Opt_RecursiveDo
+   | Opt_PatternGuards
+   | Opt_PartiallyAppliedClosedTypeSynonyms
+   | Opt_Rank2Types
+   | Opt_RankNTypes
+   | Opt_TypeOperators
+
+   | Opt_PrintExplicitForalls
 
    -- optimisation opts
    | Opt_Strictness
@@ -200,6 +222,7 @@ data DynFlag
    | Opt_UnboxStrictFields
    | Opt_DictsCheap
    | Opt_RewriteRules
+   | Opt_Vectorise
 
    -- misc opts
    | Opt_Cpp
@@ -972,13 +995,13 @@ dynamic_flags = [
   ,  ( "dsource-stats",          setDumpFlag Opt_D_source_stats)
   ,  ( "dverbose-core2core",     setDumpFlag Opt_D_verbose_core2core)
   ,  ( "dverbose-stg2stg",       setDumpFlag Opt_D_verbose_stg2stg)
-  ,  ( "ddump-hi-diffs",         setDumpFlag Opt_D_dump_hi_diffs)
   ,  ( "ddump-hi",               setDumpFlag Opt_D_dump_hi)
   ,  ( "ddump-minimal-imports",  setDumpFlag Opt_D_dump_minimal_imports)
   ,  ( "ddump-vect",         	 setDumpFlag Opt_D_dump_vect)
   ,  ( "ddump-hpc",         	 setDumpFlag Opt_D_dump_hpc)
   ,  ( "ddump-mod-cycles",     	 setDumpFlag Opt_D_dump_mod_cycles)
   
+  ,  ( "ddump-hi-diffs",         NoArg (setDynFlag Opt_D_dump_hi_diffs))
   ,  ( "dcore-lint",       	 NoArg (setDynFlag Opt_DoCoreLinting))
   ,  ( "dstg-lint",        	 NoArg (setDynFlag Opt_DoStgLinting))
   ,  ( "dcmm-lint",		 NoArg (setDynFlag Opt_DoCmmLinting))
@@ -1063,6 +1086,7 @@ fFlags = [
   ( "warn-deprecations",         	Opt_WarnDeprecations ),
   ( "warn-orphans",	         	Opt_WarnOrphans ),
   ( "warn-tabs",	         	Opt_WarnTabs ),
+  ( "print-explicit-foralls", Opt_PrintExplicitForalls ),
   ( "strictness",			Opt_Strictness ),
   ( "full-laziness",			Opt_FullLaziness ),
   ( "liberate-case",			Opt_LiberateCase ),
@@ -1083,21 +1107,37 @@ fFlags = [
   ( "force-recomp",			Opt_ForceRecomp ),
   ( "hpc-no-auto",			Opt_Hpc_No_Auto ),
   ( "rewrite-rules",			Opt_RewriteRules ),
-  ( "break-on-exception",               Opt_BreakOnException )
+  ( "break-on-exception",               Opt_BreakOnException ),
+  ( "vectorise",                        Opt_Vectorise )
   ]
 
 
 -- These -X<blah> flags can all be reversed with -Xno-<blah>
 xFlags :: [(String, DynFlag)]
 xFlags = [
+  ( "CPP",                              Opt_Cpp ),
+  ( "PatternGuards",                    Opt_PatternGuards ),
+  ( "UnicodeSyntax",                    Opt_UnicodeSyntax ),
+  ( "MagicHash",                        Opt_MagicHash ),
+  ( "PolymorphicComponents",            Opt_PolymorphicComponents ),
+  ( "ExistentialQuantification",        Opt_ExistentialQuantification ),
+  ( "KindSignatures",                   Opt_KindSignatures ),
+  ( "PatternSignatures",                Opt_PatternSignatures ),
+  ( "EmptyDataDecls",                   Opt_EmptyDataDecls ),
+  ( "ParallelListComp",                 Opt_ParallelListComp ),
   ( "FI",				Opt_FFI ),  -- support `-ffi'...
   ( "FFI",				Opt_FFI ),  -- ...and also `-fffi'
-  ( "ForeignFunctionInterface",		Opt_FFI ),  -- ...and also `-fffi'
+  ( "ForeignFunctionInterface",		Opt_FFI ),
 
+  ( "PartiallyAppliedClosedTypeSynonyms", Opt_PartiallyAppliedClosedTypeSynonyms ),
+  ( "Rank2Types",                       Opt_Rank2Types ),
+  ( "RankNTypes",                       Opt_RankNTypes ),
+  ( "TypeOperators",                    Opt_TypeOperators ),
+  ( "RecursiveDo",                      Opt_RecursiveDo ),
   ( "Arrows",				Opt_Arrows ), -- arrow syntax
   ( "Parr",				Opt_PArr ),
 
-  ( "TH",				Opt_TH ),
+  ( "TH",				Opt_TH ), -- support -fth
   ( "TemplateHaskelll",			Opt_TH ),
 
   ( "Generics",  			Opt_Generics ),
@@ -1118,6 +1158,12 @@ xFlags = [
   ( "ExtendedDefaultRules",		Opt_ExtendedDefaultRules ),
   ( "ImplicitParams",			Opt_ImplicitParams ),
   ( "ScopedTypeVariables",  		Opt_ScopedTypeVariables ),
+  ( "TypeSynonymInstances",         Opt_TypeSynonymInstances ),
+  ( "FlexibleContexts",             Opt_FlexibleContexts ),
+  ( "FlexibleInstances",            Opt_FlexibleInstances ),
+  ( "MultiParamTypeClasses",        Opt_MultiParamTypeClasses ),
+  ( "FunctionalDependencies",        Opt_FunctionalDependencies ),
+  ( "GeneralizedNewtypeDeriving",   Opt_GeneralizedNewtypeDeriving ),
   ( "AllowOverlappingInstances", 	Opt_AllowOverlappingInstances ),
   ( "AllowUndecidableInstances", 	Opt_AllowUndecidableInstances ),
   ( "AllowIncoherentInstances", 	Opt_AllowIncoherentInstances )
@@ -1129,10 +1175,30 @@ impliedFlags = [
   ]
 
 glasgowExtsFlags = [ Opt_GlasgowExts 
+           , Opt_PrintExplicitForalls
 		   , Opt_FFI 
 		   , Opt_GADTs
 		   , Opt_ImplicitParams 
 		   , Opt_ScopedTypeVariables
+           , Opt_TypeSynonymInstances
+           , Opt_FlexibleContexts
+           , Opt_FlexibleInstances
+           , Opt_MultiParamTypeClasses
+           , Opt_FunctionalDependencies
+		   , Opt_MagicHash
+           , Opt_PolymorphicComponents
+           , Opt_ExistentialQuantification
+           , Opt_UnicodeSyntax
+           , Opt_PatternGuards
+           , Opt_PartiallyAppliedClosedTypeSynonyms
+           , Opt_RankNTypes
+           , Opt_TypeOperators
+           , Opt_RecursiveDo
+           , Opt_ParallelListComp
+           , Opt_EmptyDataDecls
+           , Opt_KindSignatures
+           , Opt_PatternSignatures
+           , Opt_GeneralizedNewtypeDeriving
 		   , Opt_TypeFamilies ]
 
 ------------------
@@ -1429,7 +1495,7 @@ machdepCCOpts dflags
 	       sta = opt_Static
 	   in
 	            ( [ if sta then "-DDONT_WANT_WIN32_DLL_SUPPORT" else ""
---                    , if suffixMatch "mingw32" cTARGETPLATFORM then "-mno-cygwin" else "" 
+--                    , if "mingw32" `isSuffixOf` cTARGETPLATFORM then "-mno-cygwin" else "" 
 		      ],
 		      [ "-fno-defer-pop",
 #ifdef HAVE_GCC_MNO_OMIT_LFPTR