[project @ 2004-09-30 10:35:15 by simonpj]

[ghc-hetmet.git] / ghc / compiler / coreSyn / ExternalCore.lhs

diff --git a/ghc/compiler/coreSyn/ExternalCore.lhs b/ghc/compiler/coreSyn/ExternalCore.lhs
index cadb639..09a6e7f 100644 (file)
--- a/ghc/compiler/coreSyn/ExternalCore.lhs
+++ b/ghc/compiler/coreSyn/ExternalCore.lhs
@@ -5,23 +5,23 @@
 
 module ExternalCore where
 
-import List (elemIndex)
 
 data Module 
- = Module Mname [Tdef] [(Bool,Vdefg)]
+ = Module Mname [Tdef] [Vdefg]
 
 data Tdef 
-  = Data Tcon [Tbind] [Cdef]
-  | Newtype Tcon [Tbind] (Maybe Ty)
+  = Data (Qual Tcon) [Tbind] [Cdef]
+  | Newtype (Qual Tcon) [Tbind] (Maybe Ty)
 
 data Cdef 
   = Constr Dcon [Tbind] [Ty]
+  | GadtConstr Dcon Ty
 
 data Vdefg 
   = Rec [Vdef]
   | Nonrec Vdef
 
-type Vdef = (Var,Ty,Exp) 
+type Vdef = (Var,Ty,Exp)       -- Top level bindings are unqualified now
 
 data Exp 
   = Var (Qual Var)
@@ -31,10 +31,10 @@ data Exp
   | Appt Exp Ty
   | Lam Bind Exp         
   | Let Vdefg Exp
-  | Case Exp Vbind [Alt] {- non-empty list -}
+  | Case Exp Vbind Ty [Alt] {- non-empty list -}
   | Coerce Ty Exp 
   | Note String Exp
-  | Ccall String Ty
+  | External String Ty
 
 data Bind 
   = Vb Vbind
@@ -59,14 +59,12 @@ data Kind
   | Kunlifted
   | Kopen
   | Karrow Kind Kind
-  deriving (Eq)
 
 data Lit 
   = Lint Integer Ty
   | Lrational Rational Ty
   | Lchar Char Ty
   | Lstring String Ty
- deriving (Eq)
   
 
 type Mname = Id
@@ -79,28 +77,7 @@ type Qual t = (Mname,t)
 
 type Id = String
 
-equalTy t1 t2 =  eqTy [] [] t1 t2 
-  where eqTy e1 e2 (Tvar v1) (Tvar v2) =
-            case (elemIndex v1 e1,elemIndex v2 e2) of
-               (Just i1, Just i2) -> i1 == i2
-               (Nothing, Nothing)  -> v1 == v2
-               _ -> False
-       eqTy e1 e2 (Tcon c1) (Tcon c2) = c1 == c2
-        eqTy e1 e2 (Tapp t1a t1b) (Tapp t2a t2b) =
-             eqTy e1 e2 t1a t2a && eqTy e1 e2 t1b t2b
-        eqTy e1 e2 (Tforall (tv1,tk1) t1) (Tforall (tv2,tk2) t2) =
-             tk1 == tk2 && eqTy (tv1:e1) (tv2:e2) t1 t2 
-       eqTy _ _ _ _ = False
-
-instance Eq Ty where (==) = equalTy
-
-subKindOf :: Kind -> Kind -> Bool
-_ `subKindOf` Kopen = True
-k1 `subKindOf` k2 = k1 == k2  -- don't worry about higher kinds
-
-instance Ord Kind where (<=) = subKindOf
-
-primMname = "PrelGHC"
+primMname = "GHCziPrim"
 
 tcArrow :: Qual Tcon
 tcArrow = (primMname, "ZLzmzgZR")