Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1158/algebra/prop
Modified Files:
prop_guide.c
Log Message:
-- Extended guide loading to cope with QNames (instead of strings).
-- Cleaned up and simplified guide property inference.
-- Extended guide property inference. (QName support; Steps evaluated
on the guide without result nodes now get an empty guide mapping
---instead of no mapping.)
U prop_guide.c
Index: prop_guide.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_guide.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- prop_guide.c 17 Mar 2008 17:41:18 -0000 1.25
+++ prop_guide.c 26 Mar 2008 11:41:17 -0000 1.26
@@ -29,7 +29,6 @@
* $Id$
*/
-
#include "pathfinder.h"
#include <assert.h>
#include <string.h>
@@ -48,875 +47,688 @@
/* guide_mapping_list of n */
#define MAPPING_LIST(n) ((n)->prop->guide_mapping_list)
[...1655 lines suppressed...]
+ ret = (PFguide_tree_t **) PFmalloc (count * sizeof (PFguide_tree_t *));
- for(unsigned int i = 0; i < count; i++) {
- ret[i] = *((PFguide_tree_t**)PFarray_at(guide_list, i));
+ index = mapping->first_guide;
+ i = 0;
+
+ /* return the guides in guide id order */
+ while (index >= 0) {
+ assert (index < (int) PFarray_last (mapping->guide_order));
+ ret[i++] = GUIDE_AT(mapping->guide_list, index);
+ index = GUIDE_IDX_AT(mapping->guide_order, index);
}
return ret;
}
/* vim:set shiftwidth=4 expandtab filetype=c: */
-
-
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
