X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2Fttype.ugn;h=d89ee20ff96ef04bd13f013a6c5124104ec51e00;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=d32f5eb6fa4d151305e83fb20abfc2e0b8b8cac5;hpb=9dd6e1c216993624a2cd74b62ca0f0569c02c26b;p=ghc-hetmet.git

diff --git a/ghc/compiler/parser/ttype.ugn b/ghc/compiler/parser/ttype.ugn
index d32f5eb..d89ee20 100644
--- a/ghc/compiler/parser/ttype.ugn
+++ b/ghc/compiler/parser/ttype.ugn
@@ -12,16 +12,18 @@ import U_list
 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; >;
+	tutuple	: < gtutuple	: list; >;
 	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;