Add -fparr deprecated flag, and change -XParr to -XPArr

[ghc-hetmet.git] / compiler / main / DynFlags.hs

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index cecaa10..32faa8d 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -166,7 +166,7 @@ data DynFlag
    | Opt_MonomorphismRestriction
    | Opt_MonoPatBinds
    | Opt_ExtendedDefaultRules          -- Use GHC's extended rules for defaulting
-   | Opt_FFI
+   | Opt_ForeignFunctionInterface
    | Opt_UnliftedFFITypes
    | Opt_PArr                          -- Syntactic support for parallel arrays
    | Opt_Arrows                                -- Arrow-notation syntax
@@ -1138,9 +1138,9 @@ fFlags = [
   -- Deprecated in favour of -XTemplateHaskell:
   ( "th",                               Opt_TH ),
   -- Deprecated in favour of -XForeignFunctionInterface:
-  ( "fi",                               Opt_FFI ),
+  ( "fi",                               Opt_ForeignFunctionInterface ),
   -- Deprecated in favour of -XForeignFunctionInterface:
-  ( "ffi",                              Opt_FFI ),
+  ( "ffi",                              Opt_ForeignFunctionInterface ),
   -- Deprecated in favour of -XArrows:
   ( "arrows",                           Opt_Arrows ),
   -- Deprecated in favour of -XGenerics:
@@ -1159,6 +1159,8 @@ fFlags = [
   ( "implicit-params",                  Opt_ImplicitParams ),
   -- Deprecated in favour of -XScopedTypeVariables:
   ( "scoped-type-variables",            Opt_ScopedTypeVariables ),
+  -- Deprecated in favour of -XPArr:
+  ( "parr",                             Opt_PArr ),
   -- Deprecated in favour of -XOverlappingInstances:
   ( "AllowOverlappingInstances",        Opt_AllowOverlappingInstances ),
   -- Deprecated in favour of -XUndecidableInstances:
@@ -1181,7 +1183,7 @@ xFlags = [
   ( "PatternSignatures",                Opt_PatternSignatures ),
   ( "EmptyDataDecls",                   Opt_EmptyDataDecls ),
   ( "ParallelListComp",                 Opt_ParallelListComp ),
-  ( "ForeignFunctionInterface",         Opt_FFI ),
+  ( "ForeignFunctionInterface",         Opt_ForeignFunctionInterface ),
   ( "UnliftedFFITypes",                 Opt_UnliftedFFITypes ),
   ( "PartiallyAppliedClosedTypeSynonyms",
     Opt_PartiallyAppliedClosedTypeSynonyms ),
@@ -1190,7 +1192,7 @@ xFlags = [
   ( "TypeOperators",                    Opt_TypeOperators ),
   ( "RecursiveDo",                      Opt_RecursiveDo ),
   ( "Arrows",                           Opt_Arrows ),
-  ( "Parr",                             Opt_PArr ),
+  ( "PArr",                             Opt_PArr ),
   ( "TemplateHaskell",                  Opt_TH ),
   ( "Generics",                         Opt_Generics ),
   -- On by default:
@@ -1232,7 +1234,7 @@ impliedFlags = [
 
 glasgowExtsFlags = [
              Opt_PrintExplicitForalls
-                  , Opt_FFI 
+           , Opt_ForeignFunctionInterface
            , Opt_UnliftedFFITypes
                   , Opt_GADTs
                   , Opt_ImplicitParams