extensionToGHCFlag is now version dependent, and uses -XFoo flags for…

… >=6.7
haskell · Aug 4, 2007 · 04ee4f6 · 04ee4f6
1 parent dc48982
commit 04ee4f6
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 42 deletions.
diff --git a/Distribution/Compiler.hs b/Distribution/Compiler.hs
@@ -100,50 +100,112 @@ compilerPkgToolPath = programPath . compilerPkgTool
 
 -- |For the given compiler, return the unsupported extensions, and the
 -- flags for the supported extensions.
-extensionsToFlags :: CompilerFlavor -> [ Extension ] -> ([Extension], [Opt])
-extensionsToFlags GHC exts = extensionsToGHCFlag exts
-extensionsToFlags Hugs exts = extensionsToHugsFlag exts
-extensionsToFlags NHC exts = extensionsToNHCFlag exts
-extensionsToFlags JHC exts = extensionsToJHCFlag exts
-extensionsToFlags _ exts = (exts, [])
+extensionsToFlags :: CompilerFlavor -> Version -> [ Extension ]
+                  -> ([Extension], [Opt])
+extensionsToFlags GHC  v exts = extensionsToGHCFlag  v exts
+extensionsToFlags Hugs _ exts = extensionsToHugsFlag   exts
+extensionsToFlags NHC  _ exts = extensionsToNHCFlag    exts
+extensionsToFlags JHC  _ exts = extensionsToJHCFlag    exts
+extensionsToFlags _    _ exts = (exts, [])
 
 -- |GHC: Return the unsupported extensions, and the flags for the supported extensions
-extensionsToGHCFlag :: [ Extension ] -> ([Extension], [Opt])
-extensionsToGHCFlag l
+extensionsToGHCFlag :: Version -> [ Extension ] -> ([Extension], [Opt])
+extensionsToGHCFlag v l
     = splitEither $ nub $ map extensionToGHCFlag l
     where
+    v6_7 = Version { versionBranch = [6, 7], versionTags = [] }
     extensionToGHCFlag :: Extension -> Either Extension String
-    extensionToGHCFlag OverlappingInstances         = Right "-fallow-overlapping-instances"
-    extensionToGHCFlag TypeSynonymInstances         = Right "-fglasgow-exts"
-    extensionToGHCFlag TemplateHaskell              = Right "-fth"
-    extensionToGHCFlag ForeignFunctionInterface     = Right "-fffi"
-    extensionToGHCFlag NoMonomorphismRestriction    = Right "-fno-monomorphism-restriction"
-    extensionToGHCFlag UndecidableInstances         = Right "-fallow-undecidable-instances"
-    extensionToGHCFlag IncoherentInstances          = Right "-fallow-incoherent-instances"
-    extensionToGHCFlag Arrows                       = Right "-farrows"
-    extensionToGHCFlag Generics                     = Right "-fgenerics"
-    extensionToGHCFlag NoImplicitPrelude            = Right "-fno-implicit-prelude"
-    extensionToGHCFlag ImplicitParams               = Right "-fimplicit-params"
-    extensionToGHCFlag CPP                          = Right "-cpp"
-
-    extensionToGHCFlag BangPatterns                 = Right "-fbang-patterns"
-    extensionToGHCFlag KindSignatures               = Right "-fglasgow-exts"
-    extensionToGHCFlag RecursiveDo                  = Right "-fglasgow-exts"
-    extensionToGHCFlag ParallelListComp             = Right "-fglasgow-exts"
-    extensionToGHCFlag MultiParamTypeClasses        = Right "-fglasgow-exts"
-    extensionToGHCFlag FunctionalDependencies       = Right "-fglasgow-exts"
-    extensionToGHCFlag Rank2Types                   = Right "-fglasgow-exts"
-    extensionToGHCFlag RankNTypes                   = Right "-fglasgow-exts"
-    extensionToGHCFlag PolymorphicComponents        = Right "-fglasgow-exts"
-    extensionToGHCFlag ExistentialQuantification    = Right "-fglasgow-exts"
-    extensionToGHCFlag ScopedTypeVariables          = Right "-fglasgow-exts"
-    extensionToGHCFlag FlexibleContexts             = Right "-fglasgow-exts"
-    extensionToGHCFlag FlexibleInstances            = Right "-fglasgow-exts"
-    extensionToGHCFlag EmptyDataDecls               = Right "-fglasgow-exts"
-    extensionToGHCFlag PatternGuards                = Right "-fglasgow-exts"
-    extensionToGHCFlag GeneralizedNewtypeDeriving   = Right "-fglasgow-exts"
-    extensionToGHCFlag MagicHash                    = Right "-fglasgow-exts"
-    extensionToGHCFlag TypeFamilies                 = Right "-XTypeFamilies"
+    extensionToGHCFlag OverlappingInstances
+     | v >= v6_7 = Right "-XOverlappingInstances"
+     | otherwise = Right "-fallow-overlapping-instances"
+    extensionToGHCFlag TypeSynonymInstances
+     | v >= v6_7 = Right "-XTypeSynonymInstances"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag TemplateHaskell
+     | v >= v6_7 = Right "-XTemplateHaskell"
+     | otherwise = Right "-fth"
+    extensionToGHCFlag ForeignFunctionInterface
+     | v >= v6_7 = Right "-XForeignFunctionInterface"
+     | otherwise = Right "-fffi"
+    extensionToGHCFlag NoMonomorphismRestriction
+     | v >= v6_7 = Right "-XNoMonomorphismRestriction"
+     | otherwise = Right "-fno-monomorphism-restriction"
+    extensionToGHCFlag UndecidableInstances
+     | v >= v6_7 = Right "-XUndecidableInstances"
+     | otherwise = Right "-fallow-undecidable-instances"
+    extensionToGHCFlag IncoherentInstances
+     | v >= v6_7 = Right "-XIncoherentInstances"
+     | otherwise = Right "-fallow-incoherent-instances"
+    extensionToGHCFlag Arrows
+     | v >= v6_7 = Right "-XArrows"
+     | otherwise = Right "-farrows"
+    extensionToGHCFlag Generics
+     | v >= v6_7 = Right "-XGenerics"
+     | otherwise = Right "-fgenerics"
+    extensionToGHCFlag NoImplicitPrelude
+     | v >= v6_7 = Right "-XNoImplicitPrelude"
+     | otherwise = Right "-fno-implicit-prelude"
+    extensionToGHCFlag ImplicitParams
+     | v >= v6_7 = Right "-XImplicitParams"
+     | otherwise = Right "-fimplicit-params"
+    extensionToGHCFlag CPP
+     | v >= v6_7 = Right "-XCPP"
+     | otherwise = Right "-cpp"
+
+    extensionToGHCFlag BangPatterns
+     | v >= v6_7 = Right "-XBangPatterns"
+     | otherwise = Right "-fbang-patterns"
+    extensionToGHCFlag KindSignatures
+     | v >= v6_7 = Right "-XKindSignatures"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag RecursiveDo
+     | v >= v6_7 = Right "-XRecursiveDo"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag ParallelListComp
+     | v >= v6_7 = Right "-XParallelListComp"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag MultiParamTypeClasses
+     | v >= v6_7 = Right "-XMultiParamTypeClasses"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag FunctionalDependencies
+     | v >= v6_7 = Right "-XFunctionalDependencies"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag Rank2Types
+     | v >= v6_7 = Right "-XRank2Types"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag RankNTypes
+     | v >= v6_7 = Right "-XRankNTypes"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag PolymorphicComponents
+     | v >= v6_7 = Right "-XPolymorphicComponents"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag ExistentialQuantification
+     | v >= v6_7 = Right "-XExistentialQuantification"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag ScopedTypeVariables
+     | v >= v6_7 = Right "-XScopedTypeVariables"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag FlexibleContexts
+     | v >= v6_7 = Right "-XFlexibleContexts"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag FlexibleInstances
+     | v >= v6_7 = Right "-XFlexibleInstances"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag EmptyDataDecls
+     | v >= v6_7 = Right "-XEmptyDataDecls"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag PatternGuards
+     | v >= v6_7 = Right "-XPatternGuards"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag GeneralizedNewtypeDeriving
+     | v >= v6_7 = Right "-XGeneralizedNewtypeDeriving"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag MagicHash
+     | v >= v6_7 = Right "-XMagicHash"
+     | otherwise = Right "-fglasgow-exts"
+    extensionToGHCFlag e@TypeFamilies
+     | v >= v6_7 = Right "-XTypeFamilies"
+     | otherwise = Left e
 
     extensionToGHCFlag e@ExtensibleRecords          = Left e
     extensionToGHCFlag e@RestrictedTypeSynonyms     = Left e

diff --git a/Distribution/Simple/Configure.hs b/Distribution/Simple/Configure.hs
@@ -250,7 +250,7 @@ configure (pkg_descr0, pbi) cfg
         let lib = library pkg_descr
         let extlist = nub $ maybe [] (extensions . libBuildInfo) lib ++
                       concat [ extensions exeBi | Executable _ _ exeBi <- executables pkg_descr ]
-        let exts = fst $ extensionsToFlags flavor extlist
+        let exts = fst $ extensionsToFlags flavor version extlist
         unless (null exts) $ warn (configVerbose cfg) $ -- Just warn, FIXME: Should this be an error?
             show flavor ++ " does not support the following extensions:\n " ++
             concat (intersperse ", " (map show exts))

diff --git a/Distribution/Simple/GHC.hs b/Distribution/Simple/GHC.hs
@@ -383,7 +383,7 @@ constructGHCCmdLine lbi bi odir verbosity =
 
 ghcOptions :: LocalBuildInfo -> BuildInfo -> FilePath -> [String]
 ghcOptions lbi bi odir
-     =  (if compilerVersion (compiler lbi) > Version [6,4] []
+     =  (if version > Version [6,4] []
             then ["-hide-all-packages"]
             else [])
      ++ (if splitObjs lbi then ["-split-objs"] else [])
@@ -399,7 +399,8 @@ ghcOptions lbi bi odir
      ++ (concat [ ["-package", showPackageId pkg] | pkg <- packageDeps lbi ])
      ++ (if withOptimization lbi then ["-O"] else [])
      ++ hcOptions GHC (options bi)
-     ++ snd (extensionsToGHCFlag (extensions bi))
+     ++ snd (extensionsToGHCFlag version (extensions bi))
+    where version = compilerVersion (compiler lbi)
 
 constructCcCmdLine :: LocalBuildInfo -> BuildInfo -> FilePath
                    -> FilePath -> Verbosity -> (FilePath,[String])