Rename Opt_FFI to Opt_ForeignFunctionInterface to match the language name

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index cecaa10..3de4012 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_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
    | 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:
   -- Deprecated in favour of -XTemplateHaskell:
   ( "th",                               Opt_TH ),
   -- Deprecated in favour of -XForeignFunctionInterface:

-  ( "fi",                               Opt_FFI ),
+  ( "fi",                               Opt_ForeignFunctionInterface ),

   -- Deprecated in favour of -XForeignFunctionInterface:
   -- Deprecated in favour of -XForeignFunctionInterface:

-  ( "ffi",                              Opt_FFI ),
+  ( "ffi",                              Opt_ForeignFunctionInterface ),

   -- Deprecated in favour of -XArrows:
   ( "arrows",                           Opt_Arrows ),
   -- Deprecated in favour of -XGenerics:
   -- Deprecated in favour of -XArrows:
   ( "arrows",                           Opt_Arrows ),
   -- Deprecated in favour of -XGenerics:

@@ -1181,7 +1181,7 @@ xFlags = [
   ( "PatternSignatures",                Opt_PatternSignatures ),
   ( "EmptyDataDecls",                   Opt_EmptyDataDecls ),
   ( "ParallelListComp",                 Opt_ParallelListComp ),
   ( "PatternSignatures",                Opt_PatternSignatures ),
   ( "EmptyDataDecls",                   Opt_EmptyDataDecls ),
   ( "ParallelListComp",                 Opt_ParallelListComp ),

-  ( "ForeignFunctionInterface",         Opt_FFI ),
+  ( "ForeignFunctionInterface",         Opt_ForeignFunctionInterface ),

   ( "UnliftedFFITypes",                 Opt_UnliftedFFITypes ),
   ( "PartiallyAppliedClosedTypeSynonyms",
     Opt_PartiallyAppliedClosedTypeSynonyms ),
   ( "UnliftedFFITypes",                 Opt_UnliftedFFITypes ),
   ( "PartiallyAppliedClosedTypeSynonyms",
     Opt_PartiallyAppliedClosedTypeSynonyms ),

@@ -1232,7 +1232,7 @@ impliedFlags = [
 
 glasgowExtsFlags = [
              Opt_PrintExplicitForalls
 
 glasgowExtsFlags = [
              Opt_PrintExplicitForalls

-                  , Opt_FFI 
+           , Opt_ForeignFunctionInterface

            , Opt_UnliftedFFITypes
                   , Opt_GADTs
                   , Opt_ImplicitParams 
            , Opt_UnliftedFFITypes
                   , Opt_GADTs
                   , Opt_ImplicitParams 

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 7165709..1823864 100644 (file)
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -1560,7 +1560,7 @@ mkPState buf loc flags  =
     }
     where
       bitmap = genericsBit `setBitIf` dopt Opt_Generics flags
     }
     where
       bitmap = genericsBit `setBitIf` dopt Opt_Generics flags

-              .|. ffiBit       `setBitIf` dopt Opt_FFI          flags
+              .|. ffiBit       `setBitIf` dopt Opt_ForeignFunctionInterface flags

               .|. parrBit      `setBitIf` dopt Opt_PArr         flags
               .|. arrowsBit    `setBitIf` dopt Opt_Arrows       flags
               .|. thBit        `setBitIf` dopt Opt_TH           flags
               .|. parrBit      `setBitIf` dopt Opt_PArr         flags
               .|. arrowsBit    `setBitIf` dopt Opt_Arrows       flags
               .|. thBit        `setBitIf` dopt Opt_TH           flags