X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FModule.lhs;h=0a1c4a52cdf8e4219691302ae61d29a29224e9b8;hb=3b1438a9757639d7f37f10e1237e2369ca0ebe4a;hp=720c51f163e507633187bf7dab736a8f56e67f4e;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc;p=ghc-hetmet.git diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs index 720c51f..0a1c4a5 100644 --- a/compiler/basicTypes/Module.lhs +++ b/compiler/basicTypes/Module.lhs @@ -1,5 +1,5 @@ % -% (c) The University of Glasgow, 2004 +% (c) The University of Glasgow, 2004-2006 % Module @@ -9,6 +9,13 @@ These are Uniquable, hence we can build FiniteMaps with Modules as the keys. \begin{code} +{-# OPTIONS -w #-} +-- The above warning supression flag is a temporary kludge. +-- While working on this module you are encouraged to remove it and fix +-- any warnings in the module. See +-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings +-- for details + module Module ( -- * The ModuleName type @@ -48,10 +55,10 @@ module Module #include "HsVersions.h" import Outputable -import Unique ( Uniquable(..) ) +import Unique import FiniteMap import UniqFM -import PackageConfig ( PackageId, packageIdFS, mainPackageId ) +import PackageConfig import FastString import Binary \end{code} @@ -194,7 +201,7 @@ pprPackagePrefix p mod = getPprStyle doc if p == mainPackageId then empty -- never qualify the main package in code else ftext (zEncodeFS (packageIdFS p)) <> char '_' - | Just pkg <- qualModule sty mod = ftext (packageIdFS pkg) <> char ':' + | qualModule sty mod = ftext (packageIdFS (modulePackageId mod)) <> char ':' -- the PrintUnqualified tells us which modules have to -- be qualified with package names | otherwise = empty