Be a bit more sensible about choosing external OccNames

[ghc-hetmet.git] / compiler / basicTypes / Module.lhs

diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs
index 6b52b32..2eebf65 100644 (file)
--- a/compiler/basicTypes/Module.lhs
+++ b/compiler/basicTypes/Module.lhs
@@ -37,7 +37,6 @@ module Module
        rtsPackageId,
        haskell98PackageId,
        thPackageId,
-        ndpPackageId,
         dphSeqPackageId,
         dphParPackageId,
        mainPackageId,
@@ -70,6 +69,7 @@ module Module
        emptyModuleSet, mkModuleSet, moduleSetElts, extendModuleSet, elemModuleSet
     ) where
 
+import Config
 import Outputable
 import qualified Pretty
 import Unique
@@ -213,6 +213,9 @@ data Module = Module {
   }
   deriving (Eq, Ord)
 
+instance Uniquable Module where
+  getUnique (Module p n) = getUnique (packageIdFS p `appendFS` moduleNameFS n)
+
 instance Outputable Module where
   ppr = pprModule
 
@@ -314,15 +317,14 @@ packageIdString = unpackFS . packageIdFS
 
 integerPackageId, primPackageId,
   basePackageId, rtsPackageId, haskell98PackageId,
-  thPackageId, ndpPackageId, dphSeqPackageId, dphParPackageId,
+  thPackageId, dphSeqPackageId, dphParPackageId,
   mainPackageId  :: PackageId
 primPackageId      = fsToPackageId (fsLit "ghc-prim")
-integerPackageId   = fsToPackageId (fsLit "integer")
+integerPackageId   = fsToPackageId (fsLit cIntegerLibrary)
 basePackageId      = fsToPackageId (fsLit "base")
 rtsPackageId      = fsToPackageId (fsLit "rts")
 haskell98PackageId = fsToPackageId (fsLit "haskell98")
 thPackageId        = fsToPackageId (fsLit "template-haskell")
-ndpPackageId       = fsToPackageId (fsLit "ndp")
 dphSeqPackageId    = fsToPackageId (fsLit "dph-seq")
 dphParPackageId    = fsToPackageId (fsLit "dph-par")