Update of /cvsroot/monetdb/pathfinder/compiler/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3002/core
Modified Files:
Tag: XQuery_0-24
coreopt.brg
Log Message:
-- Add some more comments to the just added bugfix.
U coreopt.brg
Index: coreopt.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/coreopt.brg,v
retrieving revision 1.67.2.1
retrieving revision 1.67.2.2
diff -u -d -r1.67.2.1 -r1.67.2.2
--- coreopt.brg 29 May 2008 11:51:25 -0000 1.67.2.1
+++ coreopt.brg 29 May 2008 12:02:24 -0000 1.67.2.2
@@ -748,10 +748,16 @@
/* rewrite conjunctive selections into nested selections */
if (L(p)->kind == c_apply &&
!PFqname_eq (L(p)->sem.fun->qname, PFqname (PFns_op, "and"))) {
- PFcnode_t *sec_arg = LLRL(p);
- assert (PFty_subtype (TY(sec_arg), PFty_xs_boolean()));
- L(p) = LLL(p);
- RL(p) = if_ (sec_arg, then_else (RL(p), empty ()));
+ PFcnode_t *fst_and_arg = LLL(p),
+ *sec_and_arg = LLRL(p);
+
+ assert (PFty_subtype (TY(fst_and_arg), PFty_xs_boolean()));
+ assert (PFty_subtype (TY(sec_and_arg), PFty_xs_boolean()));
+
+ L(p) = fst_and_arg;
+ /* replace then branch input by a nested if-then-else
+ checking for the second argument of op:and */
+ RL(p) = if_ (sec_and_arg, then_else (RL(p), empty ()));
/* type-check what we just created */
PFty_check (p);
-------------------------------------------------------------------------
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
