projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TysWiredIn is now warning-free
[ghc-hetmet.git]
/
compiler
/
coreSyn
/
ExternalCore.lhs
diff --git
a/compiler/coreSyn/ExternalCore.lhs
b/compiler/coreSyn/ExternalCore.lhs
index
5754f84
..
a326a54
100644
(file)
--- a/
compiler/coreSyn/ExternalCore.lhs
+++ b/
compiler/coreSyn/ExternalCore.lhs
@@
-10,20
+10,19
@@
data Module
data Tdef
= Data (Qual Tcon) [Tbind] [Cdef]
data Tdef
= Data (Qual Tcon) [Tbind] [Cdef]
- | Newtype (Qual Tcon) [Tbind] Axiom (Maybe Ty)
+ | Newtype (Qual Tcon) (Qual Tcon) [Tbind] (Maybe Ty)
data Cdef
data Cdef
- = Constr Dcon [Tbind] [Ty]
- | GadtConstr Dcon Ty
-
--- Newtype coercion
-type Axiom = (Qual Tcon, Kind)
+ = Constr (Qual Dcon) [Tbind] [Ty]
+ | GadtConstr (Qual Dcon) Ty
data Vdefg
= Rec [Vdef]
| Nonrec Vdef
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)
data Exp
= Var (Qual Var)
@@
-86,7
+85,7
@@
type Id = String
primMname :: Mname
-- For truly horrible reasons, this must be z-encoded.
-- With any hope, the z-encoding will die soon.
primMname :: Mname
-- For truly horrible reasons, this must be z-encoded.
-- With any hope, the z-encoding will die soon.
-primMname = "ghc-prim:GHCziPrim"
+primMname = "ghczmprim:GHCziPrim"
tcArrow :: Qual Tcon
tcArrow = (primMname, "(->)")
tcArrow :: Qual Tcon
tcArrow = (primMname, "(->)")