X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=10bebab2d487c4e1cb5c404a19cb8711a0eaef4e;hb=230dc0b04ad444140cab040073adfd0efba24878;hp=93add2b33ed3a12c20662e74380ad9f738e2ec7d;hpb=ace2d4a6b98b30397ba9f572aff64c13524cad3b;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 93add2b..10bebab 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -183,11 +183,23 @@ 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_ParallelListComp
+   | Opt_GeneralizedNewtypeDeriving
+   | Opt_RecursiveDo
+   | Opt_PatternGuards
+   | Opt_Rank2Types
+   | Opt_RankNTypes
 
    -- optimisation opts
    | Opt_Strictness
@@ -1097,7 +1109,12 @@ fFlags = [
 -- 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 ),
   ( "EmptyDataDecls",                   Opt_EmptyDataDecls ),
   ( "ParallelListComp",                 Opt_ParallelListComp ),
@@ -1105,6 +1122,9 @@ xFlags = [
   ( "FFI",				Opt_FFI ),  -- ...and also `-fffi'
   ( "ForeignFunctionInterface",		Opt_FFI ),
 
+  ( "Rank2Types",                       Opt_Rank2Types ),
+  ( "RankNTypes",                       Opt_RankNTypes ),
+  ( "RecursiveDo",                      Opt_RecursiveDo ),
   ( "Arrows",				Opt_Arrows ), -- arrow syntax
   ( "Parr",				Opt_PArr ),
 
@@ -1129,7 +1149,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 )
@@ -1145,11 +1170,22 @@ glasgowExtsFlags = [ Opt_GlasgowExts
 		   , 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_RankNTypes
+           , Opt_RecursiveDo
            , Opt_ParallelListComp
            , Opt_EmptyDataDecls
            , Opt_KindSignatures
+           , Opt_GeneralizedNewtypeDeriving
 		   , Opt_TypeFamilies ]
 
 ------------------