Update of /cvsroot/monetdb/pathfinder/compiler/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19781/core
Modified Files:
coreopt.brg
Log Message:
-- Fixing bug [ 1877300 ] XQ: reduce: Assertion `rule' failed.
A new state label for the empty sequence constructor
(introduced in a bogus-step-rewrite) was missing.
Index: coreopt.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/coreopt.brg,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- coreopt.brg 11 Jan 2008 10:46:59 -0000 1.55
+++ coreopt.brg 22 Jan 2008 14:40:24 -0000 1.56
@@ -1284,10 +1284,10 @@
if (PFty_subtype (TY(LL(p)), PFty_empty ())) {
*p = *str ("");
TY(p) = PFty_xs_string ();
+ rewritten = true;
/* assign new node a state label */
- relabel (p, kids);
- rewritten = true;
+ PFcoreopt_label (p);
break;
}
else if (PFty_subtype (TY(LL(p)), PFty_xs_string ())) {
@@ -1353,6 +1353,9 @@
*p = *empty ();
TY(p) = PFty_empty ();
rewritten = true;
+
+ /* assign new node a state label */
+ PFcoreopt_label (p);
break;
}
break;
@@ -1404,6 +1407,7 @@
STATE_LABEL(R(p)));
}
+ assert (STATE_LABEL(p));
}
/* Collect all let (and position) bound variables and additionally
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
