Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21653/compiler/algebra/opt
Modified Files:
opt_algebra_cse.c
Log Message:
propagated changes of Monday Feb 11 2008 - Tuesday Feb 12 2008
from the XQuery_0-22 branch to the development trunk
Index: opt_algebra_cse.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_algebra_cse.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- opt_algebra_cse.c 6 Feb 2008 16:36:31 -0000 1.17
+++ opt_algebra_cse.c 12 Feb 2008 18:52:10 -0000 1.18
@@ -679,8 +679,7 @@
static bool
atom_eq (PFalg_atom_t a, PFalg_atom_t b)
{
- if (a.type != b.type)
- return false;
+ assert (PFalg_atom_comparable (a,b));
switch (a.type) {
/* if type is nat, compare nat member of union */
@@ -1281,7 +1280,8 @@
/* check every item of the column */
for (i = 0; i < littbl1->sem.lit_tbl.count; i++) {
- if (!atom_eq (a[i].atoms[col1], b[i].atoms[col2]))
+ if (!PFalg_atom_comparable (a[i].atoms[col1], b[i].atoms[col2]) ||
+ !atom_eq (a[i].atoms[col1], b[i].atoms[col2]))
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
