From 2c4b58d916b109f7285916a61dfd2755eeb7f22d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 4 Aug 2007 15:42:34 +0000 Subject: [PATCH] Rename Opt_FFI to Opt_ForeignFunctionInterface to match the language name --- compiler/main/DynFlags.hs | 10 +++++----- compiler/parser/Lexer.x | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index cecaa10..3de4012 100644 --- 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: @@ -1181,7 +1181,7 @@ xFlags = [ ( "PatternSignatures", Opt_PatternSignatures ), ( "EmptyDataDecls", Opt_EmptyDataDecls ), ( "ParallelListComp", Opt_ParallelListComp ), - ( "ForeignFunctionInterface", Opt_FFI ), + ( "ForeignFunctionInterface", Opt_ForeignFunctionInterface ), ( "UnliftedFFITypes", Opt_UnliftedFFITypes ), ( "PartiallyAppliedClosedTypeSynonyms", Opt_PartiallyAppliedClosedTypeSynonyms ), @@ -1232,7 +1232,7 @@ impliedFlags = [ glasgowExtsFlags = [ Opt_PrintExplicitForalls - , Opt_FFI + , Opt_ForeignFunctionInterface , Opt_UnliftedFFITypes , Opt_GADTs , Opt_ImplicitParams diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x index 7165709..1823864 100644 --- 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 - .|. 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 -- 1.7.10.4