[project @ 2002-06-06 07:48:47 by simonpj]

[ghc-hetmet.git] / ghc / compiler / hsSyn / HsLit.lhs

diff --git a/ghc/compiler/hsSyn/HsLit.lhs b/ghc/compiler/hsSyn/HsLit.lhs
index aa19b64..03dd717 100644 (file)
--- a/ghc/compiler/hsSyn/HsLit.lhs
+++ b/ghc/compiler/hsSyn/HsLit.lhs
@@ -9,9 +9,9 @@ module HsLit where
 #include "HsVersions.h"
 
 import Type    ( Type )
-import Name    ( Name )
-import HsTypes ( PostTcType )
+import HsTypes ( SyntaxName, PostTcType )
 import Outputable
+import FastString
 import Ratio   ( Rational )
 \end{code}
 
@@ -27,8 +27,8 @@ import Ratio  ( Rational )
 data HsLit
   = HsChar         Int                 -- Character
   | HsCharPrim     Int                 -- Unboxed character
-  | HsString       FAST_STRING         -- String
-  | HsStringPrim    FAST_STRING                -- Packed string
+  | HsString       FastString          -- String
+  | HsStringPrim    FastString         -- Packed string
   | HsInt          Integer             -- Genuinely an Int; arises from TcGenDeriv, 
                                        --      and from TRANSLATION
   | HsIntPrim      Integer             -- Unboxed Int
@@ -36,7 +36,7 @@ data HsLit
   | HsRat          Rational Type       -- Genuinely a rational; arises only from TRANSLATION
   | HsFloatPrim            Rational            -- Unboxed Float
   | HsDoublePrim    Rational           -- Unboxed Double
-  | HsLitLit       FAST_STRING PostTcType      -- to pass ``literal literals'' through to C
+  | HsLitLit       FastString PostTcType       -- to pass ``literal literals'' through to C
                                                -- also: "overloaded" type; but
                                                -- must resolve to boxed-primitive!
        -- The Type in HsLitLit is needed when desuaring;
@@ -57,9 +57,9 @@ instance Eq HsLit where
   lit1             == lit2              = False
 
 data HsOverLit                         -- An overloaded literal
-  = HsIntegral     Integer  Name       -- Integer-looking literals;
+  = HsIntegral     Integer  SyntaxName -- Integer-looking literals;
                                        -- The name is fromInteger
-  | HsFractional    Rational Name      -- Frac-looking literals
+  | HsFractional    Rational SyntaxName        -- Frac-looking literals
                                        -- The name is fromRational
 
 instance Eq HsOverLit where
@@ -86,7 +86,7 @@ instance Outputable HsLit where
     ppr (HsFloatPrim f)         = rational f <> char '#'
     ppr (HsDoublePrim d) = rational d <> text "##"
     ppr (HsIntPrim i)   = integer i  <> char '#'
-    ppr (HsLitLit s _)  = hcat [text "``", ptext s, text "''"]
+    ppr (HsLitLit s _)  = hcat [text "``", ftext s, text "''"]
 
 instance Outputable HsOverLit where
   ppr (HsIntegral i _)   = integer i