projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings in basicTypes/VarSet
[ghc-hetmet.git]
/
compiler
/
basicTypes
/
Module.lhs
diff --git
a/compiler/basicTypes/Module.lhs
b/compiler/basicTypes/Module.lhs
index
9d60247
..
fcfcbb1
100644
(file)
--- a/
compiler/basicTypes/Module.lhs
+++ b/
compiler/basicTypes/Module.lhs
@@
-28,6
+28,8
@@
module Module
packageIdString,
-- * Wired-in PackageIds
packageIdString,
-- * Wired-in PackageIds
+ primPackageId,
+ integerPackageId,
basePackageId,
rtsPackageId,
haskell98PackageId,
basePackageId,
rtsPackageId,
haskell98PackageId,
@@
-67,9
+69,11
@@
import Outputable
import qualified Pretty
import Unique
import FiniteMap
import qualified Pretty
import Unique
import FiniteMap
-import UniqFM
+import LazyUniqFM
import FastString
import Binary
import FastString
import Binary
+
+import System.FilePath
\end{code}
%************************************************************************
\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
-- 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}
%************************************************************************
\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).
-- 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
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")
basePackageId = fsToPackageId FSLIT("base")
rtsPackageId = fsToPackageId FSLIT("rts")
haskell98PackageId = fsToPackageId FSLIT("haskell98")