projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1998-12-02 13:17:09 by simonm]
[ghc-hetmet.git]
/
ghc
/
compiler
/
parser
/
ttype.ugn
diff --git
a/ghc/compiler/parser/ttype.ugn
b/ghc/compiler/parser/ttype.ugn
index
d32f5eb
..
d89ee20
100644
(file)
--- a/
ghc/compiler/parser/ttype.ugn
+++ b/
ghc/compiler/parser/ttype.ugn
@@
-12,16
+12,18
@@
import U_list
import U_qid
%}}
type ttype;
import U_qid
%}}
type ttype;
- tname : < gtypeid : qid; >;
- namedtvar : < gnamedtvar : qid; >;
+ tname : < gtypeid : qid; >; /* tycon */
+ namedtvar : < gnamedtvar : stringId; >; /* tvar */
tllist : < gtlist : ttype; >;
ttuple : < gttuple : list; >;
tllist : < gtlist : ttype; >;
ttuple : < gttuple : list; >;
+ tutuple : < gtutuple : list; >;
tfun : < gtin : ttype;
gtout : ttype; >;
tapp : < gtapp : ttype;
gtarg : ttype; >;
tbang : < gtbang : ttype; >;
tfun : < gtin : ttype;
gtout : ttype; >;
tapp : < gtapp : ttype;
gtarg : ttype; >;
tbang : < gtbang : ttype; >;
- context : < gtcontextl : list;
- gtcontextt : ttype; >;
+ forall : < gtforalltv : list; /* tyvars */
+ gtforallctxt : list; /* theta */
+ gtforallt : ttype; >;
end;
end;