X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FExternalCore.lhs;h=d3b6e3ace509101a9dd10f57a49674dd6a527bdc;hp=89b27125d6588b4cc1f03cea71a3ab5e0d15ed72;hb=4c6a3f787abcaed009a574196d82237d9ae64fc8;hpb=e513c1cc1de895fed5796d16cb67525f4b581b2a

diff --git a/compiler/coreSyn/ExternalCore.lhs b/compiler/coreSyn/ExternalCore.lhs
index 89b2712..d3b6e3a 100644
--- a/compiler/coreSyn/ExternalCore.lhs
+++ b/compiler/coreSyn/ExternalCore.lhs
@@ -2,7 +2,6 @@
 % (c) The University of Glasgow 2001-2006
 %
 \begin{code}
-
 module ExternalCore where
 
 
@@ -11,17 +10,22 @@ data Module
 
 data Tdef 
   = Data (Qual Tcon) [Tbind] [Cdef]
-  | Newtype (Qual Tcon) [Tbind] (Maybe Ty)
+  | Newtype (Qual Tcon) [Tbind] Axiom (Maybe Ty)
 
 data Cdef 
-  = Constr Dcon [Tbind] [Ty]
-  | GadtConstr Dcon Ty
+  = Constr (Qual Dcon) [Tbind] [Ty]
+  | GadtConstr (Qual Dcon) Ty
+
+-- Newtype coercion
+type Axiom = (Qual Tcon, [Tbind], Kind)
 
 data Vdefg 
   = Rec [Vdef]
   | Nonrec Vdef
 
-type Vdef = (Bool,Var,Ty,Exp) 	-- Top level bindings are unqualified now
+-- Top-level bindings are qualified, so that the printer doesn't have to pass
+-- around the module name.
+type Vdef = (Bool,Qual Var,Ty,Exp)
 
 data Exp 
   = Var (Qual Var)
@@ -62,6 +66,7 @@ data Kind
   | Kunboxed
   | Kopen
   | Karrow Kind Kind
+  | Keq Ty Ty
 
 data Lit 
   = Lint Integer Ty
@@ -80,7 +85,10 @@ type Qual t = (Mname,t)
 
 type Id = String
 
-primMname = "base:GHC.Prim"
+primMname :: Mname
+-- For truly horrible reasons, this must be z-encoded.
+-- With any hope, the z-encoding will die soon.
+primMname = "ghczmprim:GHCziPrim"
 
 tcArrow :: Qual Tcon
 tcArrow = (primMname, "(->)")