[commit: ghc] master: use qualified names for clarity (1e303c7)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1e303c702e205cfb0da1353fa232e527f546522d

>---------------------------------------------------------------

commit 1e303c702e205cfb0da1353fa232e527f546522d
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Aug 23 16:06:23 2011 +0100

    use qualified names for clarity

>---------------------------------------------------------------

 compiler/cmm/BlockId.hs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/cmm/BlockId.hs b/compiler/cmm/BlockId.hs
index c28201c..feeacb5 100644
--- a/compiler/cmm/BlockId.hs
+++ b/compiler/cmm/BlockId.hs
@@ -14,7 +14,7 @@ import Name
 import Outputable
 import Unique
 
-import Compiler.Hoopl hiding (Unique)
+import Compiler.Hoopl as Hoopl hiding (Unique)
 import Compiler.Hoopl.GHC (uniqueToInt, uniqueToLbl, lblToUnique)
 
 ----------------------------------------------------------------
@@ -29,7 +29,7 @@ most assembly languages allow, a label is visible throughout the entire
 compilation unit in which it appears.
 -}
 
-type BlockId = Label
+type BlockId = Hoopl.Label
 
 instance Uniquable BlockId where
   getUnique label = getUnique (uniqueToInt $ lblToUnique label)
@@ -50,7 +50,7 @@ infoTblLbl :: BlockId -> CLabel
 infoTblLbl label = mkInfoTableLabel (mkFCallName (getUnique label) "block") NoCafRefs
 
 -- Block environments: Id blocks
-type BlockEnv a = LabelMap a
+type BlockEnv a = Hoopl.LabelMap a
 
 instance Outputable a => Outputable (BlockEnv a) where
   ppr = ppr . mapToList
@@ -59,7 +59,7 @@ emptyBlockMap :: BlockEnv a
 emptyBlockMap = mapEmpty
 
 -- Block sets
-type BlockSet = LabelSet
+type BlockSet = Hoopl.LabelSet
 
 instance Outputable BlockSet where
   ppr = ppr . setElems