X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=9a8804aa0baa9fe9beff8a3cac05c09dd6945e12;hb=2a8cdc3aee5997374273e27365f92c161aca8453;hp=f02e6767745ae3af79e7ba866814eeff97d83236;hpb=6e0c3f50e131f502577a61b09a339af295de9d23;p=ghc-hetmet.git diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index f02e676..9a8804a 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1,3 +1,4 @@ +{-# OPTIONS -fno-warn-missing-fields #-} ----------------------------------------------------------------------------- -- -- Dynamic flags @@ -38,13 +39,14 @@ module DynFlags ( getVerbFlag, updOptLevel, setTmpDir, + setPackageName, -- parsing DynFlags parseDynamicFlags, allFlags, -- misc stuff - machdepCCOpts, picCCOpts, + machdepCCOpts, picCCOpts ) where #include "HsVersions.h" @@ -63,6 +65,7 @@ import Config import CmdLineParser import Constants ( mAX_CONTEXT_REDUCTION_DEPTH ) import Panic ( panic, GhcException(..) ) +import UniqFM ( UniqFM ) import Util ( notNull, splitLongestPrefix, normalisePath ) import Maybes ( fromJust, orElse ) import SrcLoc ( SrcSpan ) @@ -165,6 +168,7 @@ data DynFlag | Opt_ImplicitPrelude | Opt_ScopedTypeVariables | Opt_BangPatterns + | Opt_IndexedTypes -- optimisation opts | Opt_Strictness @@ -183,7 +187,7 @@ data DynFlag -- misc opts | Opt_Cpp | Opt_Pp - | Opt_RecompChecking + | Opt_ForceRecomp | Opt_DryRun | Opt_DoAsmMangling | Opt_ExcessPrecision @@ -192,6 +196,8 @@ data DynFlag | Opt_SplitObjs | Opt_StgStats | Opt_HideAllPackages + | Opt_PrintBindResult + | Opt_Haddock -- keeping stuff | Opt_KeepHiDiffs @@ -246,6 +252,9 @@ data DynFlags = DynFlags { cmdlineFrameworks :: [String], -- ditto tmpDir :: String, -- no trailing '/' + ghcUsagePath :: FilePath, -- Filled in by SysTools + ghciUsagePath :: FilePath, -- ditto + -- options for particular phases opt_L :: [String], opt_P :: [String], @@ -267,16 +276,23 @@ data DynFlags = DynFlags { pgm_a :: (String,[Option]), pgm_l :: (String,[Option]), pgm_dll :: (String,[Option]), + pgm_T :: String, + pgm_sysman :: String, - -- ** Package flags + -- Package flags extraPkgConfs :: [FilePath], + topDir :: FilePath, -- filled in by SysTools + systemPackageConfig :: FilePath, -- ditto -- The -package-conf flags given on the command line, in the order -- they appeared. packageFlags :: [PackageFlag], -- The -package and -hide-package flags from the command-line - -- ** Package state + -- Package state + -- NB. do not modify this field, it is calculated by + -- Packages.initPackages and Packages.updatePackages. + pkgDatabase :: Maybe (UniqFM InstalledPackageInfo), pkgState :: PackageState, -- hsc dynamic flags @@ -290,7 +306,6 @@ data HscTarget = HscC | HscAsm | HscJava - | HscILX | HscInterpreted | HscNothing deriving (Eq, Show) @@ -322,6 +337,7 @@ data PackageFlag = ExposePackage String | HidePackage String | IgnorePackage String + deriving Eq defaultHscTarget | cGhcWithNativeCodeGen == "YES" = HscAsm @@ -359,10 +375,6 @@ defaultDynFlags = ctxtStkDepth = mAX_CONTEXT_REDUCTION_DEPTH, thisPackage = mainPackageId, - - wayNames = panic "ways", - buildTag = panic "buildTag", - rtsBuildTag = panic "rtsBuildTag", objectDir = Nothing, hiDir = Nothing, @@ -390,22 +402,12 @@ defaultDynFlags = opt_dll = [], opt_dep = [], - pgm_L = panic "pgm_L", - pgm_P = panic "pgm_P", - pgm_F = panic "pgm_F", - pgm_c = panic "pgm_c", - pgm_m = panic "pgm_m", - pgm_s = panic "pgm_s", - pgm_a = panic "pgm_a", - pgm_l = panic "pgm_l", - pgm_dll = panic "pgm_mkdll", - extraPkgConfs = [], packageFlags = [], - pkgState = panic "pkgState", + pkgDatabase = Nothing, + pkgState = panic "no package state yet: call GHC.setSessionDynFlags", flags = [ - Opt_RecompChecking, Opt_ReadUserPackageConf, Opt_MonoPatBinds, -- Experimentally, I'm making this non-standard @@ -430,8 +432,10 @@ defaultDynFlags = -- and the default no-optimisation options: Opt_IgnoreInterfacePragmas, - Opt_OmitInterfacePragmas + Opt_OmitInterfacePragmas, + -- on by default: + Opt_PrintBindResult ] ++ standardWarnings, log_action = \severity srcSpan style msg -> @@ -810,7 +814,6 @@ dynamic_flags = [ , ( "F" , NoArg (setDynFlag Opt_Pp)) , ( "#include" , HasArg (addCmdlineHCInclude) ) , ( "v" , OptIntSuffix setVerbosity ) - ------- Specific phases -------------------------------------------- , ( "pgmL" , HasArg (upd . setPgmL) ) , ( "pgmP" , HasArg (upd . setPgmP) ) @@ -871,15 +874,16 @@ dynamic_flags = [ ------- Miscellaneous ---------------------------------------------- , ( "no-hs-main" , NoArg (setDynFlag Opt_NoHsMain)) , ( "main-is" , SepArg setMainIs ) + , ( "haddock" , NoArg (setDynFlag Opt_Haddock) ) - ------- recompilation checker -------------------------------------- - , ( "recomp" , NoArg (setDynFlag Opt_RecompChecking) ) - , ( "no-recomp" , NoArg (unSetDynFlag Opt_RecompChecking) ) + ------- recompilation checker (DEPRECATED, use -fforce-recomp) ----- + , ( "recomp" , NoArg (unSetDynFlag Opt_ForceRecomp) ) + , ( "no-recomp" , NoArg (setDynFlag Opt_ForceRecomp) ) ------- Packages ---------------------------------------------------- , ( "package-conf" , HasArg extraPkgConf_ ) , ( "no-user-package-conf", NoArg (unSetDynFlag Opt_ReadUserPackageConf) ) - , ( "package-name" , HasArg setPackageName ) + , ( "package-name" , HasArg (upd . setPackageName) ) , ( "package" , HasArg exposePackage ) , ( "hide-package" , HasArg hidePackage ) , ( "hide-all-packages", NoArg (setDynFlag Opt_HideAllPackages) ) @@ -937,7 +941,7 @@ dynamic_flags = [ , ( "dcore-lint", NoArg (setDynFlag Opt_DoCoreLinting)) , ( "dstg-lint", NoArg (setDynFlag Opt_DoStgLinting)) , ( "dcmm-lint", NoArg (setDynFlag Opt_DoCmmLinting)) - , ( "dshow-passes", NoArg (do unSetDynFlag Opt_RecompChecking + , ( "dshow-passes", NoArg (do setDynFlag Opt_ForceRecomp setVerbosity (Just 2)) ) , ( "dfaststring-stats", NoArg (setDynFlag Opt_D_faststring_stats)) @@ -974,7 +978,6 @@ dynamic_flags = [ , ( "fasm", AnySuffix (\_ -> setTarget HscAsm) ) , ( "fvia-c", NoArg (setTarget HscC) ) , ( "fvia-C", NoArg (setTarget HscC) ) - , ( "filx", NoArg (setTarget HscILX) ) , ( "fglasgow-exts", NoArg (mapM_ setDynFlag glasgowExtsFlags) ) , ( "fno-glasgow-exts", NoArg (mapM_ unSetDynFlag glasgowExtsFlags) ) @@ -1014,6 +1017,7 @@ fFlags = [ ( "implicit-prelude", Opt_ImplicitPrelude ), ( "scoped-type-variables", Opt_ScopedTypeVariables ), ( "bang-patterns", Opt_BangPatterns ), + ( "indexed-types", Opt_IndexedTypes ), ( "monomorphism-restriction", Opt_MonomorphismRestriction ), ( "mono-pat-binds", Opt_MonoPatBinds ), ( "extended-default-rules", Opt_ExtendedDefaultRules ), @@ -1035,15 +1039,18 @@ fFlags = [ ( "unbox-strict-fields", Opt_UnboxStrictFields ), ( "dicts-cheap", Opt_DictsCheap ), ( "excess-precision", Opt_ExcessPrecision ), - ( "asm-mangling", Opt_DoAsmMangling ) + ( "asm-mangling", Opt_DoAsmMangling ), + ( "print-bind-result", Opt_PrintBindResult ), + ( "force-recomp", Opt_ForceRecomp ) ] + glasgowExtsFlags = [ Opt_GlasgowExts, Opt_FFI, Opt_ImplicitParams, Opt_ScopedTypeVariables, - Opt_BangPatterns ] + Opt_IndexedTypes ] isFFlag f = f `elem` (map fst fFlags) getFFlag f = fromJust (lookup f fFlags) @@ -1073,7 +1080,7 @@ unSetDynFlag f = upd (\dfs -> dopt_unset dfs f) setDumpFlag :: DynFlag -> OptKind DynP setDumpFlag dump_flag - = NoArg (unSetDynFlag Opt_RecompChecking >> setDynFlag dump_flag) + = NoArg (setDynFlag Opt_ForceRecomp >> setDynFlag dump_flag) -- Whenver we -ddump, switch off the recompilation checker, -- else you don't see the dump! @@ -1090,20 +1097,20 @@ hidePackage p = upd (\s -> s{ packageFlags = HidePackage p : packageFlags s }) ignorePackage p = upd (\s -> s{ packageFlags = IgnorePackage p : packageFlags s }) + setPackageName p | Nothing <- unpackPackageId pid = throwDyn (CmdLineError ("cannot parse \'" ++ p ++ "\' as a package identifier")) | otherwise - = upd (\s -> s{ thisPackage = pid }) + = \s -> s{ thisPackage = pid } where pid = stringToPackageId p --- we can only switch between HscC, HscAsmm, and HscILX with dynamic flags +-- we can only switch between HscC, and HscAsmm with dynamic flags -- (-fvia-C, -fasm, -filx respectively). setTarget l = upd (\dfs -> case hscTarget dfs of HscC -> dfs{ hscTarget = l } HscAsm -> dfs{ hscTarget = l } - HscILX -> dfs{ hscTarget = l } _ -> dfs) setOptLevel :: Int -> DynFlags -> DynFlags