X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=a56a4091e8b02976d31b52a4d96b8dbf1e45c2a3;hb=6c9010f6ea6a7cb9feea45b3a5c06db0d4f7d3b2;hp=4bdfc657221d839eb6fc8dc2fd926a9467ba8b11;hpb=747216123e3619d6844c1a4001ec30c1baebab08;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 4bdfc65..a56a409 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -183,14 +183,25 @@ 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
+
+   | Opt_PrintExplicitForalls
 
    -- optimisation opts
    | Opt_Strictness
@@ -1072,6 +1083,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 ),
@@ -1100,7 +1112,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 ),
@@ -1108,6 +1125,8 @@ 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 ),
@@ -1133,6 +1152,9 @@ 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 ),
@@ -1147,13 +1169,22 @@ 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_RankNTypes
            , Opt_RecursiveDo
            , Opt_ParallelListComp
            , Opt_EmptyDataDecls