[project @ 1998-04-16 10:03:50 by sof]

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

diff --git a/ghc/compiler/parser/binding.ugn b/ghc/compiler/parser/binding.ugn
index b03ba07..76b067c 100644 (file)
--- a/ghc/compiler/parser/binding.ugn
+++ b/ghc/compiler/parser/binding.ugn
@@ -2,10 +2,10 @@
 #include "hspincl.h"
 %}
 %{{
+module U_binding where
+
 #include "HsVersions.h"
 
-module U_binding where
-IMP_Ubiq() --  debugging consistency check
 import UgenUtil
 
 import U_constr
@@ -34,9 +34,7 @@ type binding;
                    gfline      : long; >;
        abind   : < gabindfst   : binding;
                    gabindsnd   : binding; >;
-       ibind   : < gibindc     : list;
-                   gibindid    : qid;
-                   gibindi     : ttype;
+       ibind   : < gibindi     : ttype;
                    gibindw     : binding;
                    giline      : long; >;
        dbind   : < gdbindts    : list;
@@ -51,11 +49,12 @@ type binding;
 
        nullbind : < >;
 
-       import  : < gibindimod  : stringId;
-                   gibindqual  : long;
-                   gibindas    : maybe;
-                   gibindspec  : maybe;
-                   gibindline  : long; >;
+       import  : < gibindimod   : stringId;
+                   gibindqual   : long;
+                   gibindas     : maybe;
+                   gibindspec   : maybe;
+                   gibindsource : long;
+                   gibindline   : long; >;
 
        /* user-specified pragmas:XXXX */
 
@@ -73,9 +72,6 @@ type binding;
        inline_uprag: < ginline_id   : qid;
                        ginline_line : long; >;
 
-       deforest_uprag: < gdeforest_id : qid;
-                       gdeforest_line : long; >;
-
        magicuf_uprag:< gmagicuf_id   : qid;
                        gmagicuf_str  : stringId;
                        gmagicuf_line : long; >;