X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FId.lhs;h=63ef83f955434f8132067d521152d697cc2b1652;hb=8e67f5502e2e316245806ee3735a2f41a844b611;hp=cb848a13ec1de8cfa964a580913f6b80e41eb32b;hpb=0498d35528e7666b9a77a79a78d2e1e782ff0c0b;p=ghc-hetmet.git diff --git a/ghc/compiler/basicTypes/Id.lhs b/ghc/compiler/basicTypes/Id.lhs index cb848a1..63ef83f 100644 --- a/ghc/compiler/basicTypes/Id.lhs +++ b/ghc/compiler/basicTypes/Id.lhs @@ -103,7 +103,7 @@ import qualified Demand ( Demand ) import DataCon ( isUnboxedTupleCon ) import NewDemand ( Demand, StrictSig, topDmd, topSig, isBottomingSig ) import Name ( Name, OccName, nameIsLocalOrFrom, - mkSystemName, mkSystemNameEncoded, mkInternalName, + mkSystemVarName, mkSystemVarNameEncoded, mkInternalName, getOccName, getSrcLoc ) import Module ( Module ) @@ -168,10 +168,10 @@ mkVanillaGlobal :: Name -> Type -> IdInfo -> Id -- for SysLocal, we assume the base name is already encoded, to avoid -- re-encoding the same string over and over again. -mkSysLocal fs uniq ty = mkLocalId (mkSystemNameEncoded uniq fs) ty +mkSysLocal fs uniq ty = mkLocalId (mkSystemVarNameEncoded uniq fs) ty -- version to use when the faststring needs to be encoded -mkSysLocalUnencoded fs uniq ty = mkLocalId (mkSystemName uniq fs) ty +mkSysLocalUnencoded fs uniq ty = mkLocalId (mkSystemVarName uniq fs) ty mkUserLocal occ uniq ty loc = mkLocalId (mkInternalName uniq occ loc) ty mkVanillaGlobal = mkGlobalId VanillaGlobal