[project @ 1998-12-02 13:17:09 by simonm]

[ghc-hetmet.git] / ghc / compiler / parser / tree.ugn

diff --git a/ghc/compiler/parser/tree.ugn b/ghc/compiler/parser/tree.ugn
index 86c5174..19fed1e 100644 (file)
--- a/ghc/compiler/parser/tree.ugn
+++ b/ghc/compiler/parser/tree.ugn
@@ -2,10 +2,10 @@
 #include "hspincl.h"
 %}
 %{{
+module U_tree where
+
 #include "HsVersions.h"
 
-module U_tree where
-IMP_Ubiq() --  debugging consistency check
 import UgenUtil
 
 import U_constr                ( U_constr )    -- interface only
@@ -26,7 +26,8 @@ type tree;
                    ghmodline   : long; >;
        fixop   : < gfixop      : qid;
                    gfixinfx    : long;
-                   gfixprec    : long; >;
+                   gfixprec    : long; 
+                   gfixline    : long; >;
 
        ident   : < gident      : qid; >;
        lit     : < glit        : literal; >;
@@ -72,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;