X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FOccName.lhs;h=cae76a6b1be7920a6350c7090b6ce0d4b0d75a8a;hb=805edf6e400001f6e11b4721b285ecd51e0c2445;hp=9319c6762921cf4f81507e2a26c8e72c2d5d082f;hpb=d76c18e05f6366c23144624b696a02fbaa6d26e8;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/OccName.lhs b/compiler/basicTypes/OccName.lhs
index 9319c67..cae76a6 100644
--- a/compiler/basicTypes/OccName.lhs
+++ b/compiler/basicTypes/OccName.lhs
@@ -443,6 +443,7 @@ mkIPOcc		    = mk_simple_deriv varName  "$i"
 mkSpecOcc	    = mk_simple_deriv varName  "$s"
 mkForeignExportOcc  = mk_simple_deriv varName  "$f"
 mkNewTyCoOcc        = mk_simple_deriv tcName  "Co"
+mkInstTyCoOcc       = mk_simple_deriv tcName  "Co"      -- derived from rep ty
 
 -- Generic derivable classes
 mkGenOcc1           = mk_simple_deriv varName  "$gfrom"
@@ -478,24 +479,15 @@ mkLocalOcc uniq occ
 	-- that need encoding (e.g. 'z'!)
 \end{code}
 
-\begin{code}
+Derive a name for the representation type constructor of a data/newtype
+instance.
 
--- Derive a name for the representation type constructor of a data/newtype
--- instance.
---
+\begin{code}
 mkInstTyTcOcc :: Int			-- Index
-	      -> OccName		-- Local name (e.g. "Map")
+	      -> OccName		-- Family name (e.g. "Map")
 	      -> OccName		-- Nice unique version (":R23Map")
 mkInstTyTcOcc index occ
-   = mk_deriv varName (":R" ++ show index) (occNameString occ)
-
--- Derive a name for the coercion of a data/newtype instance.
---
-mkInstTyCoOcc :: Int			-- Index
-	      -> OccName		-- Local name (e.g. "Map")
-	      -> OccName		-- Nice unique version (":Co23Map")
-mkInstTyCoOcc index occ
-   = mk_deriv varName (":Co" ++ show index) (occNameString occ)
+   = mk_deriv tcName (":R" ++ show index) (occNameString occ)
 \end{code}
 
 \begin{code}