X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FName.lhs;h=3fdedfbd8ca2201db850066edb414e28dd77f7f9;hb=f7ecf7234c224489be8a5e63fced903b655d92ee;hp=4a2b799acbafe1983fcd1e43e3906e86d6d1c759;hpb=26741ec416bae2c502ef00a2ba0e79050a32cb67;p=ghc-hetmet.git

diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs
index 4a2b799..3fdedfb 100644
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/ghc/compiler/basicTypes/Name.lhs
@@ -70,9 +70,7 @@ import SrcLoc		( mkBuiltinSrcLoc, mkUnknownSrcLoc, SrcLoc )
 import Unique		( funTyConKey, mkTupleDataConUnique, mkTupleTyConUnique,
 			  pprUnique, Unique
 			)
-import Util		( thenCmp, _CMP_STRING_, nOfThem, panic, assertPanic, pprTrace{-ToDo:rm-} )
-import {-hide from mkdependHS-}
-	RnHsSyn		( RnName ) -- instance for specializing only
+import Util		( thenCmp, _CMP_STRING_, nOfThem, panic, assertPanic{-, pprTrace ToDo:rm-} )
 
 #ifdef REALLY_HASKELL_1_3
 ord = fromEnum :: Char -> Int
@@ -269,7 +267,9 @@ mkCompoundName :: Unique
 	       -> Name		-- from which we get provenance, etc....
 	       -> Name		-- result!
 
-mkCompoundName u m str ns (Local _ _ _ _) = panic "mkCompoundName:Local?"
+mkCompoundName u m str ns (Local _ _ _ locn) -- these arise for workers...
+  = Local u str True{-emph uniq-} locn
+
 mkCompoundName u m str ns (Global _ _ _ prov exp _)
   = Global u m (Right (Right str : ns)) prov exp []
 
@@ -304,9 +304,9 @@ mkTupleTyConName   arity
 
 mkTupNameStr 0 = SLIT("()")
 mkTupNameStr 1 = panic "Name.mkTupNameStr: 1 ???"
-mkTupNameStr 2 = SLIT("(,)")   -- not strictly necessary
-mkTupNameStr 3 = SLIT("(,,)")  -- ditto
-mkTupNameStr 4 = SLIT("(,,,)") -- ditto
+mkTupNameStr 2 = _PK_ "(,)"   -- not strictly necessary
+mkTupNameStr 3 = _PK_ "(,,)"  -- ditto
+mkTupNameStr 4 = _PK_ "(,,,)" -- ditto
 mkTupNameStr n
   = _PK_ ("(" ++ nOfThem (n-1) ',' ++ ")")
 
@@ -376,7 +376,7 @@ changeUnique (Global   _ m n p e os) u = Global u m n p e os
 
 nameOrigName msg (Global _ m (Left  n) _ _ _) = OrigName m n
 nameOrigName msg (Global _ m (Right n) _ _ _) = let str = _CONCAT_ (glue n) in
-						pprTrace ("nameOrigName:"++msg) (ppPStr str) $
+						--pprTrace ("nameOrigName:"++msg) (ppPStr str) $
 						OrigName m str
 #ifdef DEBUG
 nameOrigName msg (Local  _ n _ _)     = panic ("nameOrigName:Local:"++msg++":"++ _UNPK_ n)
@@ -385,7 +385,7 @@ nameOrigName msg (Local  _ n _ _)     = panic ("nameOrigName:Local:"++msg++":"++
 nameOccName (Local  _ n _ _)	     = Unqual n
 nameOccName (Global _ m (Left  n) _ _ []  )  = Qual m n
 nameOccName (Global _ m (Right n) _ _ []  )  =  let str = _CONCAT_ (glue n) in
-						pprTrace "nameOccName:" (ppPStr str) $
+						--pprTrace "nameOccName:" (ppPStr str) $
 						Qual m str
 nameOccName (Global _ m (Left  _) _ _ (o:_)) = o
 nameOccName (Global _ m (Right _) _ _ (o:_)) = panic "nameOccName:compound name"