X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2Ftree.ugn;h=19fed1ed046f1c34a082019d51b293e8df92b4e9;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=60974fa48aa80637bf3544e3a081c70d907433e7;hpb=6c381e873e222417d9a67aeec77b9555eca7b7a8;p=ghc-hetmet.git

diff --git a/ghc/compiler/parser/tree.ugn b/ghc/compiler/parser/tree.ugn
index 60974fa..19fed1e 100644
--- a/ghc/compiler/parser/tree.ugn
+++ b/ghc/compiler/parser/tree.ugn
@@ -3,13 +3,13 @@
 %}
 %{{
 module U_tree where
-import Ubiq --  debugging consistency check
+
+#include "HsVersions.h"
+
 import UgenUtil
 
 import U_constr		( U_constr )	-- interface only
 import U_binding
-import U_coresyn	( U_coresyn )	-- interface only
-import U_hpragma	( U_hpragma )	-- interface only
 import U_list
 import U_literal
 import U_maybe
@@ -22,10 +22,12 @@ type tree;
 		    ghexplist	: maybe;	/* Maybe [entity] */
 		    ghfixes     : list;		/* [fixop] */
 		    ghmodlist	: binding;
+		    ghversion   : long;
 		    ghmodline	: long; >;
-	fixop	: < gfixop	: unkId;
+	fixop	: < gfixop	: qid;
 		    gfixinfx	: long;
-		    gfixprec	: long;	>;
+		    gfixprec	: long; 
+		    gfixline    : long; >;
 
 	ident	: < gident 	: qid; >;
 	lit 	: < glit	: literal; >;
@@ -35,13 +37,7 @@ type tree;
 	infixap : < ginffun	: qid;
 		    ginfarg1	: tree;
 		    ginfarg2	: tree; >;
-	negate	: < gnexp	: tree;
-		    gnxxx1	: VOID_STAR;
-		    gnxxx2	: VOID_STAR; >;
-	/*
-	  infixap and negate have the same size
-	  so they can be rearranged in precparse
-	*/
+	negate	: < gnexp	: tree;	>;
 
 	lambda	: < glampats	: list;
 		    glamexpr	: tree;
@@ -77,12 +73,14 @@ type tree;
 	as	: < gasid	: qid;
 		    gase	: tree; >;
 	lazyp	: < glazyp	: tree; >;
+	plusp	: < gplusp	: qid; 
+		    gplusi	: literal; >;
 	wildp	: < >;
-
 	restr	: < grestre	: tree;
 		    grestrt	: ttype; >;
 
 	tuple	: < gtuplelist	: list; >;
+	utuple	: < gutuplelist	: list; >;
 	llist	: < gllist	: list; >;
 	eenum	: < gefrom	: tree;
 		    gestep	: maybe;