diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-16 15:28:26 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-16 16:08:38 +0100 |
| commit | cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5 (patch) | |
| tree | 30fb18578f1c5c81fef7ccc6ec5879a41fd4e5c0 /compiler/main/Packages.lhs | |
| parent | 6759e5a482d927870c90efe97b820d492785a6fd (diff) | |
| download | haskell-cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5.tar.gz | |
Some alpha renaming
Mostly d -> g (matching DynFlag -> GeneralFlag).
Also renamed if* to when*, matching the Haskell if/when names
Diffstat (limited to 'compiler/main/Packages.lhs')
| -rw-r--r-- | compiler/main/Packages.lhs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 8a3f6f40fe..9204763ebf 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -252,11 +252,11 @@ setBatchPackageFlags :: DynFlags -> [PackageConfig] -> [PackageConfig] setBatchPackageFlags dflags pkgs = (maybeDistrustAll . maybeHideAll) pkgs where maybeHideAll pkgs' - | dopt Opt_HideAllPackages dflags = map hide pkgs' + | gopt Opt_HideAllPackages dflags = map hide pkgs' | otherwise = pkgs' maybeDistrustAll pkgs' - | dopt Opt_DistrustAllPackages dflags = map distrust pkgs' + | gopt Opt_DistrustAllPackages dflags = map distrust pkgs' | otherwise = pkgs' hide pkg = pkg{ exposed = False } @@ -792,7 +792,7 @@ mkPackageState dflags pkgs0 preload0 this_package = do let -- add base & rts to the preload packages basicLinkedPackages - | dopt Opt_AutoLinkPackages dflags + | gopt Opt_AutoLinkPackages dflags = filter (flip elemUFM pkg_db) [basePackageId, rtsPackageId] | otherwise = [] -- but in any case remove the current package from the set of @@ -895,7 +895,7 @@ packageHsLibs dflags p = map (mkDynName . addSuffix) (hsLibraries p) tag = mkBuildTag (filter (not . wayRTSOnly) ways2) rts_tag = mkBuildTag ways2 - mkDynName | dopt Opt_Static dflags = id + mkDynName | gopt Opt_Static dflags = id | otherwise = (++ ("-ghc" ++ cProjectVersion)) addSuffix rts@"HSrts" = rts ++ (expandTag rts_tag) @@ -947,7 +947,7 @@ lookupModuleWithSuggestions dflags m where pkg_state = pkgState dflags suggestions - | dopt Opt_HelpfulErrors dflags = fuzzyLookup (moduleNameString m) all_mods + | gopt Opt_HelpfulErrors dflags = fuzzyLookup (moduleNameString m) all_mods | otherwise = [] all_mods :: [(String, Module)] -- All modules @@ -1035,7 +1035,7 @@ isDllName :: DynFlags -> PackageId -> Name -> Bool -- the synbol comes from another dynamically-linked package, -- and applies on all platforms, not just Windows isDllName dflags this_pkg name - | dopt Opt_Static dflags = False + | gopt Opt_Static dflags = False | Just mod <- nameModule_maybe name = modulePackageId mod /= this_pkg | otherwise = False -- no, it is not even an external name |