X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FModule.lhs;h=b4f9cd1d439144bfbedb84efeffa5c699236b4a1;hb=0069a47ad1a539c894f66163cf30c7d98dc9b016;hp=863fbdf4aa0cb73a0f97b3910e1e9c4ca2d4e50c;hpb=0b72ea61234c748c45a8ae305d5d6b8e81a67c93;p=ghc-hetmet.git diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs index 863fbdf..b4f9cd1 100644 --- a/compiler/basicTypes/Module.lhs +++ b/compiler/basicTypes/Module.lhs @@ -36,6 +36,7 @@ module Module basePackageId, rtsPackageId, haskell98PackageId, + sybPackageId, thPackageId, ndpPackageId, dphSeqPackageId, @@ -213,6 +214,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 @@ -303,7 +307,7 @@ packageIdString = unpackFS . packageIdFS -- normal in the packages database, and you can still have multiple -- versions of them installed. However, for each invocation of GHC, -- only a single instance of each wired-in package will be recognised --- (the desired one is selected via @-package@/@-hide-package@), and GHC +-- (the desired one is selected via @-package@\/@-hide-package@), and GHC -- will use the unversioned 'PackageId' below when referring to it, -- including in .hi files and object file symbols. Unselected -- versions of wired-in packages will be ignored, as will any other @@ -313,7 +317,7 @@ packageIdString = unpackFS . packageIdFS -- Make sure you change 'Packages.findWiredInPackages' if you add an entry here integerPackageId, primPackageId, - basePackageId, rtsPackageId, haskell98PackageId, + basePackageId, rtsPackageId, haskell98PackageId, sybPackageId, thPackageId, ndpPackageId, dphSeqPackageId, dphParPackageId, mainPackageId :: PackageId primPackageId = fsToPackageId (fsLit "ghc-prim") @@ -321,6 +325,7 @@ integerPackageId = fsToPackageId (fsLit "integer") basePackageId = fsToPackageId (fsLit "base") rtsPackageId = fsToPackageId (fsLit "rts") haskell98PackageId = fsToPackageId (fsLit "haskell98") +sybPackageId = fsToPackageId (fsLit "syb") thPackageId = fsToPackageId (fsLit "template-haskell") ndpPackageId = fsToPackageId (fsLit "ndp") dphSeqPackageId = fsToPackageId (fsLit "dph-seq")