[project @ 1998-02-05 12:23:33 by simonm]

[ghc-hetmet.git] / ghc / compiler / nativeGen / StixInfo.lhs

diff --git a/ghc/compiler/nativeGen/StixInfo.lhs b/ghc/compiler/nativeGen/StixInfo.lhs
index 82b88c6..cb84530 100644 (file)
--- a/ghc/compiler/nativeGen/StixInfo.lhs
+++ b/ghc/compiler/nativeGen/StixInfo.lhs
@@ -3,11 +3,9 @@
 %
 
 \begin{code}
-#include "HsVersions.h"
-
 module StixInfo ( genCodeInfoTable ) where
 
-import Ubiq{-uitious-}
+#include "HsVersions.h"
 
 import AbsCSyn         ( AbstractC(..), CAddrMode, ReturnInfo,
                          RegRelative, MagicId, CStmtMacro
@@ -25,8 +23,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, UniqSM )
+import Outputable      ( hcat, ptext, int, char )
 \end{code}
 
 Generating code for info tables (arrays of data).
@@ -79,21 +77,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]