diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-13 11:32:41 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-13 02:13:03 -0400 |
| commit | ed533ec217667423e4fce30040f24053dbcc7de4 (patch) | |
| tree | a810bd338fb4044538fba0c78df041a3e2c225e1 /compiler/GHC/Unit/Subst.hs | |
| parent | f50c19b8a78da9252cb39f49c1c66db4a684cc3b (diff) | |
| download | haskell-ed533ec217667423e4fce30040f24053dbcc7de4.tar.gz | |
Rename Package into Unit
The terminology changed over time and now package databases contain
"units" (there can be several units compiled from a single Cabal
package: one per-component, one for each option set, one per
instantiation, etc.). We should try to be consistent internally and use
"units": that's what this renaming does. Maybe one day we'll fix the UI
too (e.g. replace -package-id with -unit-id, we already have
-this-unit-id and ghc-pkg has -unit-id...) but it's not done in this
patch.
* rename getPkgFrameworkOpts into getUnitFrameworkOpts
* rename UnitInfoMap into ClosureUnitInfoMap
* rename InstalledPackageIndex into UnitInfoMap
* rename UnusablePackages into UnusableUnits
* rename PackagePrecedenceIndex into UnitPrecedenceMap
* rename PackageDatabase into UnitDatabase
* rename pkgDatabase into unitDatabases
* rename pkgState into unitState
* rename initPackages into initUnits
* rename renamePackage into renameUnitInfo
* rename UnusablePackageReason into UnusableUnitReason
* rename getPackage* into getUnit*
* etc.
Diffstat (limited to 'compiler/GHC/Unit/Subst.hs')
| -rw-r--r-- | compiler/GHC/Unit/Subst.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/GHC/Unit/Subst.hs b/compiler/GHC/Unit/Subst.hs index 3539d5a255..b911edfa80 100644 --- a/compiler/GHC/Unit/Subst.hs +++ b/compiler/GHC/Unit/Subst.hs @@ -36,9 +36,9 @@ renameHoleModule state = renameHoleModule' (unitInfoMap state) renameHoleUnit :: PackageState -> ShHoleSubst -> Unit -> Unit renameHoleUnit state = renameHoleUnit' (unitInfoMap state) --- | Like 'renameHoleModule', but requires only 'UnitInfoMap' +-- | Like 'renameHoleModule', but requires only 'ClosureUnitInfoMap' -- so it can be used by "Packages". -renameHoleModule' :: UnitInfoMap -> ShHoleSubst -> Module -> Module +renameHoleModule' :: ClosureUnitInfoMap -> ShHoleSubst -> Module -> Module renameHoleModule' pkg_map env m | not (isHoleModule m) = let uid = renameHoleUnit' pkg_map env (moduleUnit m) @@ -47,9 +47,9 @@ renameHoleModule' pkg_map env m -- NB m = <Blah>, that's what's in scope. | otherwise = m --- | Like 'renameHoleUnit, but requires only 'UnitInfoMap' +-- | Like 'renameHoleUnit, but requires only 'ClosureUnitInfoMap' -- so it can be used by "Packages". -renameHoleUnit' :: UnitInfoMap -> ShHoleSubst -> Unit -> Unit +renameHoleUnit' :: ClosureUnitInfoMap -> ShHoleSubst -> Unit -> Unit renameHoleUnit' pkg_map env uid = case uid of (VirtUnit @@ -59,7 +59,7 @@ renameHoleUnit' pkg_map env uid = -> if isNullUFM (intersectUFM_C const (udfmToUfm (getUniqDSet fh)) env) then uid -- Functorially apply the substitution to the instantiation, - -- then check the 'UnitInfoMap' to see if there is + -- then check the 'ClosureUnitInfoMap' to see if there is -- a compiled version of this 'InstantiatedUnit' we can improve to. -- See Note [VirtUnit to RealUnit improvement] else improveUnit pkg_map $ |