projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
darcs-all: allow relative path for repo in local fs
[ghc-hetmet.git]
/
compiler
/
coreSyn
/
ExternalCore.lhs
diff --git
a/compiler/coreSyn/ExternalCore.lhs
b/compiler/coreSyn/ExternalCore.lhs
index
09a6e7f
..
2fdcf2d
100644
(file)
--- a/
compiler/coreSyn/ExternalCore.lhs
+++ b/
compiler/coreSyn/ExternalCore.lhs
@@
-1,5
+1,5
@@
%
%
-% (c) The University of Glasgow 2001
+% (c) The University of Glasgow 2001-2006
%
\begin{code}
%
\begin{code}
@@
-21,7
+21,7
@@
data Vdefg
= Rec [Vdef]
| Nonrec Vdef
= Rec [Vdef]
| Nonrec Vdef
-type Vdef = (Var,Ty,Exp) -- Top level bindings are unqualified now
+type Vdef = (Bool,Var,Ty,Exp) -- Top level bindings are unqualified now
data Exp
= Var (Qual Var)
data Exp
= Var (Qual Var)
@@
-32,9
+32,11
@@
data Exp
| Lam Bind Exp
| Let Vdefg Exp
| Case Exp Vbind Ty [Alt] {- non-empty list -}
| Lam Bind Exp
| Let Vdefg Exp
| Case Exp Vbind Ty [Alt] {- non-empty list -}
- | Coerce Ty Exp
+ | Cast Exp Ty
| Note String Exp
| Note String Exp
- | External String Ty
+ | External String String Ty {- target name, convention, and type -}
+ | DynExternal String Ty {- convention and type (incl. Addr# of target as first arg) -}
+ | Label String
data Bind
= Vb Vbind
data Bind
= Vb Vbind
@@
-57,8
+59,10
@@
data Ty
data Kind
= Klifted
| Kunlifted
data Kind
= Klifted
| Kunlifted
+ | Kunboxed
| Kopen
| Karrow Kind Kind
| Kopen
| Karrow Kind Kind
+ | Keq Ty Ty
data Lit
= Lint Integer Ty
data Lit
= Lint Integer Ty
@@
-77,10
+81,10
@@
type Qual t = (Mname,t)
type Id = String
type Id = String
-primMname = "GHCziPrim"
+primMname = "base:GHC.Prim"
tcArrow :: Qual Tcon
tcArrow :: Qual Tcon
-tcArrow = (primMname, "ZLzmzgZR")
+tcArrow = (primMname, "(->)")
\end{code}
\end{code}