Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9810/compiler/algebra/opt
Modified Files:
opt_algebra_cse.c
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the XQuery_0-22 branch to the development trunk
Note there were conflicts in compiler/algebra/opt_algebra_cse.c. Jan
and Manuel, please fight it out.
Index: opt_algebra_cse.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_algebra_cse.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- opt_algebra_cse.c 16 Feb 2008 19:42:40 -0000 1.21
+++ opt_algebra_cse.c 18 Feb 2008 15:54:42 -0000 1.22
@@ -684,7 +684,8 @@
for (i = 0; i < a.count; i++) {
/* check the equivalence */
- mismatch = PFalg_atom_cmp (a.atoms[i], b.atoms[i])?true:false;
+ mismatch = !(PFalg_atom_comparable (a.atoms[i], b.atoms[i]) &&
+ (PFalg_atom_cmp (a.atoms[i], b.atoms[i]) == 0));
if (mismatch)
break;
@@ -821,7 +822,8 @@
b->sem.attach.value))
return false;
- if (PFalg_atom_cmp (a->sem.attach.value, b->sem.attach.value) != 0)
+ if (PFalg_atom_cmp (a->sem.attach.value,
+ b->sem.attach.value) != 0)
return false;
return true;
-------------------------------------------------------------------------
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
