From b5e939dafc4c5e4943901b5ff26d55b30a64b5eb Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 4 Aug 2007 15:48:05 +0000 Subject: [PATCH] Rename Opt_TH to Opt_TemplateHaskell to match the language name --- compiler/main/DynFlags.hs | 6 +++--- compiler/parser/Lexer.x | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 32faa8d..bbcf40d 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -170,7 +170,7 @@ data DynFlag | Opt_UnliftedFFITypes | Opt_PArr -- Syntactic support for parallel arrays | Opt_Arrows -- Arrow-notation syntax - | Opt_TH + | Opt_TemplateHaskell | Opt_ImplicitParams | Opt_Generics | Opt_ImplicitPrelude @@ -1136,7 +1136,7 @@ fFlags = [ ( "break-on-exception", Opt_BreakOnException ), ( "vectorise", Opt_Vectorise ), -- Deprecated in favour of -XTemplateHaskell: - ( "th", Opt_TH ), + ( "th", Opt_TemplateHaskell ), -- Deprecated in favour of -XForeignFunctionInterface: ( "fi", Opt_ForeignFunctionInterface ), -- Deprecated in favour of -XForeignFunctionInterface: @@ -1193,7 +1193,7 @@ xFlags = [ ( "RecursiveDo", Opt_RecursiveDo ), ( "Arrows", Opt_Arrows ), ( "PArr", Opt_PArr ), - ( "TemplateHaskell", Opt_TH ), + ( "TemplateHaskell", Opt_TemplateHaskell ), ( "Generics", Opt_Generics ), -- On by default: ( "ImplicitPrelude", Opt_ImplicitPrelude ), diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x index 1823864..8b637da 100644 --- a/compiler/parser/Lexer.x +++ b/compiler/parser/Lexer.x @@ -1563,7 +1563,7 @@ mkPState buf loc 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 + .|. thBit `setBitIf` dopt Opt_TemplateHaskell flags .|. ipBit `setBitIf` dopt Opt_ImplicitParams flags .|. explicitForallBit `setBitIf` dopt Opt_ScopedTypeVariables flags .|. explicitForallBit `setBitIf` dopt Opt_PolymorphicComponents flags -- 1.7.10.4