X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FModule.lhs;h=fcfcbb11568f435c9dc8afe0c3ab96c184044e1b;hb=6457193e8206bb0d4b994436e9c7c7991dd4cc30;hp=9d60247b55c69eaa0b94531c350e273aa1aa583b;hpb=98c68a1c5b63aadf9c7917274519d95bbe9394d4;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs
index 9d60247..fcfcbb1 100644
--- a/compiler/basicTypes/Module.lhs
+++ b/compiler/basicTypes/Module.lhs
@@ -28,6 +28,8 @@ module Module
         packageIdString,
 
 	-- * Wired-in PackageIds
+	primPackageId,
+	integerPackageId,
 	basePackageId,
 	rtsPackageId,
 	haskell98PackageId,
@@ -67,9 +69,11 @@ import Outputable
 import qualified Pretty
 import Unique
 import FiniteMap
-import UniqFM
+import LazyUniqFM
 import FastString
 import Binary
+
+import System.FilePath
 \end{code}
 
 %************************************************************************
@@ -178,7 +182,7 @@ mkModuleNameFS s = ModuleName s
 -- Returns the string version of the module name, with dots replaced by slashes
 moduleNameSlashes :: ModuleName -> String
 moduleNameSlashes = dots_to_slashes . moduleNameString
-  where dots_to_slashes = map (\c -> if c == '.' then '/' else c)
+  where dots_to_slashes = map (\c -> if c == '.' then pathSeparator else c)
 \end{code}
 
 %************************************************************************
@@ -275,8 +279,11 @@ packageIdString = unpackFS . packageIdFS
 -- package that depends directly or indirectly on it (much as if you
 -- had used -ignore-package).
 
-basePackageId, rtsPackageId, haskell98PackageId, 
+integerPackageId, primPackageId,
+  basePackageId, rtsPackageId, haskell98PackageId,
   thPackageId, ndpPackageId, mainPackageId  :: PackageId
+primPackageId      = fsToPackageId FSLIT("ghc-prim")
+integerPackageId   = fsToPackageId FSLIT("integer")
 basePackageId      = fsToPackageId FSLIT("base")
 rtsPackageId	   = fsToPackageId FSLIT("rts")
 haskell98PackageId = fsToPackageId FSLIT("haskell98")