[project @ 1998-01-08 18:03:08 by simonm]

[ghc-hetmet.git] / ghc / compiler / reader / PrefixSyn.lhs

diff --git a/ghc/compiler/reader/PrefixSyn.lhs b/ghc/compiler/reader/PrefixSyn.lhs
index e6c65c4..4091903 100644 (file)
--- a/ghc/compiler/reader/PrefixSyn.lhs
+++ b/ghc/compiler/reader/PrefixSyn.lhs
@@ -8,25 +8,26 @@ string from the current Haskell parser is converted.  Given in an
 order that follows the \tr{Prefix_Form} document.
 
 \begin{code}
-#include "HsVersions.h"
-
 module PrefixSyn (
        RdrBinding(..),
-       RdrId(..),
+       RdrId,
        RdrMatch(..),
-       SigConverter(..),
-       SrcFile(..),
-       SrcFun(..),
-       SrcLine(..),
+       SigConverter,
+       SrcFile,
+       SrcFun,
+       SrcLine,
 
        readInteger
     ) where
 
-import Ubiq
+#include "HsVersions.h"
 
 import HsSyn
 import RdrHsSyn
+import BasicTypes      ( IfaceFlavour )
 import Util            ( panic )
+import SrcLoc           ( SrcLoc )
+import Char            ( isDigit, ord )
 
 type RdrId   = RdrName
 type SrcLine = Int
@@ -50,13 +51,12 @@ data RdrBinding
                        -- tell if its a Sig or a ClassOpSig,
                        -- so we just save the pieces:
   | RdrTySig           [RdrName]           -- vars getting sigs
-                       RdrNamePolyType     -- the type
+                       RdrNameHsType     -- the type
                        SrcLoc
 
   -- user pragmas come in in a Sig-ish way/form...
   | RdrSpecValSig      [RdrNameSig]
   | RdrInlineValSig    RdrNameSig
-  | RdrDeforestSig     RdrNameSig
   | RdrMagicUnfoldingSig RdrNameSig
   | RdrSpecInstSig     RdrNameSpecInstSig
   | RdrSpecDataSig     RdrNameSpecDataSig
@@ -75,7 +75,7 @@ data RdrMatch
   | RdrMatch_Guards
             SrcLine SrcFun
             RdrNamePat
-            [(RdrNameHsExpr, RdrNameHsExpr)]
+            [([RdrNameStmt], RdrNameHsExpr)]
             -- (guard,         expr)
             RdrBinding
 \end{code}