diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-26 20:48:36 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-10-26 21:43:01 +0100 |
| commit | a9c93bdd8b027d6de09a3eada7721e7fd2d3e050 (patch) | |
| tree | 570c2cd55dc6943a929d8a5d9f9d80af6740935e /compiler/main | |
| parent | 499ce291b6bab252c63f0791276c38012280f0b4 (diff) | |
| download | haskell-a9c93bdd8b027d6de09a3eada7721e7fd2d3e050.tar.gz | |
Implement MIN_VERSION and VERSION macros natively in GHC.
Test Plan: validate
Reviewers: austin, thomie, bgamari
Reviewed By: thomie
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1349
GHC Trac Issues: #10970
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 45 | ||||
| -rw-r--r-- | compiler/main/Packages.hs | 11 |
2 files changed, 55 insertions, 1 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 373afba3fa..697353e5c3 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -74,6 +74,7 @@ import Data.List ( isSuffixOf ) import Data.Maybe import Data.Char import Data.Time +import Data.Version -- --------------------------------------------------------------------------- -- Pre-process @@ -2049,6 +2050,20 @@ doCpp dflags raw input_fn output_fn = do , "-include", ghcVersionH ] + -- MIN_VERSION macros + let uids = explicitPackages (pkgState dflags) + pkgs = catMaybes (map (lookupPackage dflags) uids) + mb_macro_include <- + -- Only generate if we have (1) we have set -hide-all-packages + -- (so we don't generate a HUGE macro file of things we don't + -- care about but are exposed) and (2) we actually have packages + -- to write macros for! + if gopt Opt_HideAllPackages dflags && not (null pkgs) + then do macro_stub <- newTempName dflags "h" + writeFile macro_stub (generatePackageVersionMacros pkgs) + return [SysTools.FileOption "-include" macro_stub] + else return [] + cpp_prog ( map SysTools.Option verbFlags ++ map SysTools.Option include_paths ++ map SysTools.Option hsSourceCppOpts @@ -2058,6 +2073,7 @@ doCpp dflags raw input_fn output_fn = do ++ map SysTools.Option hscpp_opts ++ map SysTools.Option sse_defs ++ map SysTools.Option avx_defs + ++ mb_macro_include -- Set the language mode to assembler-with-cpp when preprocessing. This -- alleviates some of the C99 macro rules relating to whitespace and the hash -- operator, which we tend to abuse. Clang in particular is not very happy @@ -2088,6 +2104,35 @@ getBackendDefs _ = return [] -- --------------------------------------------------------------------------- +-- Macros (cribbed from Cabal) + +generatePackageVersionMacros :: [PackageConfig] -> String +generatePackageVersionMacros pkgs = concat + [ "/* package " ++ sourcePackageIdString pkg ++ " */\n" + ++ generateMacros "" pkgname version + | pkg <- pkgs + , let version = packageVersion pkg + pkgname = map fixchar (packageNameString pkg) + ] + +fixchar :: Char -> Char +fixchar '-' = '_' +fixchar c = c + +generateMacros :: String -> String -> Version -> String +generateMacros prefix name version = + concat + ["#define ", prefix, "VERSION_",name," ",show (showVersion version),"\n" + ,"#define MIN_", prefix, "VERSION_",name,"(major1,major2,minor) (\\\n" + ," (major1) < ",major1," || \\\n" + ," (major1) == ",major1," && (major2) < ",major2," || \\\n" + ," (major1) == ",major1," && (major2) == ",major2," && (minor) <= ",minor,")" + ,"\n\n" + ] + where + (major1:major2:minor:_) = map show (versionBranch version ++ repeat 0) + +-- --------------------------------------------------------------------------- -- join object files into a single relocatable object file, using ld -r joinObjectFiles :: DynFlags -> [FilePath] -> FilePath -> IO () diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs index 0e32947b31..9f60c1cc28 100644 --- a/compiler/main/Packages.hs +++ b/compiler/main/Packages.hs @@ -7,7 +7,7 @@ module Packages ( module PackageConfig, -- * Reading the package config, and processing cmdline args - PackageState(preloadPackages), + PackageState(preloadPackages, explicitPackages), emptyPackageState, initPackages, readPackageConfigs, @@ -245,6 +245,10 @@ data PackageState = PackageState { -- is always mentioned before the packages it depends on. preloadPackages :: [UnitId], + -- | Packages which we explicitly depend on (from a command line flag). + -- We'll use this to generate version macros. + explicitPackages :: [UnitId], + -- | This is a full map from 'ModuleName' to all modules which may possibly -- be providing it. These providers may be hidden (but we'll still want -- to report them in error messages), or it may be an ambiguous import. @@ -255,6 +259,7 @@ emptyPackageState :: PackageState emptyPackageState = PackageState { pkgIdMap = emptyUFM, preloadPackages = [], + explicitPackages = [], moduleToPkgConfAll = Map.empty } @@ -961,6 +966,10 @@ mkPackageState dflags0 pkgs0 preload0 = do let pstate = PackageState{ preloadPackages = dep_preload, + explicitPackages = foldUFM (\pkg xs -> + if elemUFM (packageConfigId pkg) vis_map + then packageConfigId pkg : xs + else xs) [] pkg_db, pkgIdMap = pkg_db, moduleToPkgConfAll = mkModuleToPkgConfAll dflags pkg_db vis_map } |
