X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FStixInfo.lhs;h=56daf99c6c1e987e3697989666f5c94d9b8cf839;hb=08fc512d296aeed5508416e0241d42ab4a95ed96;hp=82b88c67608f377109d39137075804fd884f98d0;hpb=7d61cb61daa5e433a0cb85b34b7f0c58b2f961ff;p=ghc-hetmet.git

diff --git a/ghc/compiler/nativeGen/StixInfo.lhs b/ghc/compiler/nativeGen/StixInfo.lhs
index 82b88c6..56daf99 100644
--- a/ghc/compiler/nativeGen/StixInfo.lhs
+++ b/ghc/compiler/nativeGen/StixInfo.lhs
@@ -7,7 +7,7 @@
 
 module StixInfo ( genCodeInfoTable ) where
 
-import Ubiq{-uitious-}
+IMP_Ubiq(){-uitious-}
 
 import AbsCSyn		( AbstractC(..), CAddrMode, ReturnInfo,
 			  RegRelative, MagicId, CStmtMacro
@@ -25,8 +25,8 @@ import SMRep		( SMRep(..), SMSpecRepKind(..), SMUpdateKind(..),
 			)
 import Stix		-- all of it
 import StixPrim		( amodeToStix )
-import UniqSupply	( returnUs, UniqSM(..) )
-import Unpretty		( uppBesides, uppPStr, uppInt, uppChar )
+import UniqSupply	( returnUs, SYN_IE(UniqSM) )
+import Pretty		( hcat, ptext, int, char )
 \end{code}
 
 Generating code for info tables (arrays of data).
@@ -79,21 +79,21 @@ genCodeInfoTable (CClosureInfoAndCode cl_info _ _ upd cl_descr _)
 		tag]
 
 	    SpecialisedRep _ _ _ updatable ->
-		let rtbl = uppBesides (
+		let rtbl = hcat (
 		       if is_selector then
-			  [uppPStr SLIT("Select__"),
-			   uppInt select_word,
-			   uppPStr SLIT("_rtbl")]
+			  [ptext SLIT("Select__"),
+			   int select_word,
+			   ptext SLIT("_rtbl")]
 		       else
-			  [uppPStr (case updatable of
+			  [ptext (case updatable of
 				    SMNormalForm -> SLIT("Spec_N_")
 				    SMSingleEntry -> SLIT("Spec_S_")
 				    SMUpdatable -> SLIT("Spec_U_")
 				   ),
-			   uppInt size,
-			   uppChar '_',
-			   uppInt ptrs,
-			   uppPStr SLIT("_rtbl")])
+			   int size,
+			   char '_',
+			   int ptrs,
+			   ptext SLIT("_rtbl")])
 		in
 		    case updatable of
 			SMNormalForm -> [upd_code, StLitLbl rtbl, tag]