projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New syntax for GADT-style record declarations, and associated refactoring
[ghc-hetmet.git]
/
compiler
/
basicTypes
/
Module.lhs
diff --git
a/compiler/basicTypes/Module.lhs
b/compiler/basicTypes/Module.lhs
index
6b52b32
..
9afef94
100644
(file)
--- a/
compiler/basicTypes/Module.lhs
+++ b/
compiler/basicTypes/Module.lhs
@@
-37,7
+37,6
@@
module Module
rtsPackageId,
haskell98PackageId,
thPackageId,
rtsPackageId,
haskell98PackageId,
thPackageId,
- ndpPackageId,
dphSeqPackageId,
dphParPackageId,
mainPackageId,
dphSeqPackageId,
dphParPackageId,
mainPackageId,
@@
-213,6
+212,9
@@
data Module = Module {
}
deriving (Eq, Ord)
}
deriving (Eq, Ord)
+instance Uniquable Module where
+ getUnique (Module p n) = getUnique (packageIdFS p `appendFS` moduleNameFS n)
+
instance Outputable Module where
ppr = pprModule
instance Outputable Module where
ppr = pprModule
@@
-314,7
+316,7
@@
packageIdString = unpackFS . packageIdFS
integerPackageId, primPackageId,
basePackageId, rtsPackageId, haskell98PackageId,
integerPackageId, primPackageId,
basePackageId, rtsPackageId, haskell98PackageId,
- thPackageId, ndpPackageId, dphSeqPackageId, dphParPackageId,
+ thPackageId, dphSeqPackageId, dphParPackageId,
mainPackageId :: PackageId
primPackageId = fsToPackageId (fsLit "ghc-prim")
integerPackageId = fsToPackageId (fsLit "integer")
mainPackageId :: PackageId
primPackageId = fsToPackageId (fsLit "ghc-prim")
integerPackageId = fsToPackageId (fsLit "integer")
@@
-322,7
+324,6
@@
basePackageId = fsToPackageId (fsLit "base")
rtsPackageId = fsToPackageId (fsLit "rts")
haskell98PackageId = fsToPackageId (fsLit "haskell98")
thPackageId = fsToPackageId (fsLit "template-haskell")
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")
dphSeqPackageId = fsToPackageId (fsLit "dph-seq")
dphParPackageId = fsToPackageId (fsLit "dph-par")