[project @ 1997-05-19 00:12:10 by sof]

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

diff --git a/ghc/compiler/nativeGen/Stix.lhs b/ghc/compiler/nativeGen/Stix.lhs
index f187e9f..1dbd660 100644 (file)
--- a/ghc/compiler/nativeGen/Stix.lhs
+++ b/ghc/compiler/nativeGen/Stix.lhs
@@ -6,7 +6,7 @@
 #include "HsVersions.h"
 
 module Stix (
-       CodeSegment(..), StixReg(..), StixTree(..), StixTreeList(..),
+       CodeSegment(..), StixReg(..), StixTree(..), SYN_IE(StixTreeList),
        sStLitLbl,
 
        stgBaseReg, stgStkOReg, stgNode, stgTagReg, stgRetReg,
@@ -15,13 +15,17 @@ module Stix (
        getUniqLabelNCG
     ) where
 
-import Ubiq{-uitous-}
+IMP_Ubiq(){-uitous-}
+IMPORT_1_3(Ratio(Rational))
 
 import AbsCSyn         ( node, infoptr, MagicId(..) )
 import AbsCUtils       ( magicIdPrimRep )
-import CLabel          ( mkAsmTempLabel )
-import UniqSupply      ( returnUs, thenUs, getUnique, UniqSM(..) )
-import Unpretty                ( uppPStr, Unpretty(..) )
+import CLabel          ( mkAsmTempLabel, CLabel )
+import PrimRep          ( PrimRep )
+import PrimOp           ( PrimOp )
+import Unique           ( Unique )
+import UniqSupply      ( returnUs, thenUs, getUnique, SYN_IE(UniqSM) )
+import Pretty          ( ptext, Doc )
 \end{code}
 
 Here is the tag at the nodes of our @StixTree@.         Notice its
@@ -38,7 +42,7 @@ data StixTree
   | StInt      Integer     -- ** add Kind at some point
   | StDouble   Rational
   | StString   FAST_STRING
-  | StLitLbl   Unpretty    -- literal labels
+  | StLitLbl   Doc    -- literal labels
                            -- (will be _-prefixed on some machines)
   | StLitLit   FAST_STRING -- innards from CLitLit
   | StCLbl     CLabel      -- labels that we might index into
@@ -99,7 +103,7 @@ data StixTree
   | StComment FAST_STRING
 
 sStLitLbl :: FAST_STRING -> StixTree
-sStLitLbl s = StLitLbl (uppPStr s)
+sStLitLbl s = StLitLbl (ptext s)
 \end{code}
 
 Stix registers can have two forms.  They {\em may} or {\em may not}