diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-11 11:03:10 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-14 21:40:49 -0700 |
| commit | b92a51f5e235fc22a9ae0d76735b50f095665fb7 (patch) | |
| tree | 27eb41de475255206185e68c535c2d899012fa1b /compiler/ghci/ByteCodeLink.hs | |
| parent | 5b0191f74ab05b187f81ea037623338a615b1619 (diff) | |
| download | haskell-b92a51f5e235fc22a9ae0d76735b50f095665fb7.tar.gz | |
Rename package key to unit ID, and installed package ID to component ID.
Comes with Haddock submodule update.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'compiler/ghci/ByteCodeLink.hs')
| -rw-r--r-- | compiler/ghci/ByteCodeLink.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/ghci/ByteCodeLink.hs b/compiler/ghci/ByteCodeLink.hs index 5090f99065..b977f370d3 100644 --- a/compiler/ghci/ByteCodeLink.hs +++ b/compiler/ghci/ByteCodeLink.hs @@ -250,12 +250,12 @@ nameToCLabel :: Name -> String -> String nameToCLabel n suffix = label where encodeZ = zString . zEncodeFS (Module pkgKey modName) = ASSERT( isExternalName n ) nameModule n - packagePart = encodeZ (packageKeyFS pkgKey) + packagePart = encodeZ (unitIdFS pkgKey) modulePart = encodeZ (moduleNameFS modName) occPart = encodeZ (occNameFS (nameOccName n)) label = concat - [ if pkgKey == mainPackageKey then "" else packagePart ++ "_" + [ if pkgKey == mainUnitId then "" else packagePart ++ "_" , modulePart , '_':occPart , '_':suffix |