Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31415/compiler/include
Modified Files:
mil.h mil_mnemonic.h
Log Message:
-- Moved step logic into the runtime (part 2):
Attribute step code now also recides in the runtime (PROC step()).
parent, ancestor, and ancestor-or-self steps now correctly
return results if some context nodes are attribute nodes.
TODO: - Implement self step logic in the runtime.
- Correctly return attribute context nodes in
ancestor-or-self, descendant-or-self, and self steps.
-- Added tests that check the correctness of the step implementations
along upward and *self steps starting from attribute context nodes.
REMARK: The current version of pf_support.mx crashes
the Mserver---double free if I'm correct---(and thus
breaks the Testweb) because of the ``correct'' Mil
code in lines 2032-2052. (Any arbitrary additional
MIL statement in these lines makes it work again.)
Index: mil_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil_mnemonic.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- mil_mnemonic.h 18 Mar 2008 14:27:43 -0000 1.48
+++ mil_mnemonic.h 20 Mar 2008 10:55:12 -0000 1.49
@@ -379,8 +379,8 @@
#define mpcre_replace(a,b,c,d) PFmil_mpcre_replace ((a),(b),(c),(d))
/** general purpose staircase join */
-#define step(a,b,c,d,e,f,g,h,i,j,k) \
- PFmil_step ((a), (b), (c), (d), (e), (f), (g), (h), (i), (j), (k))
+#define step(a,b,c,d,e,f,g,h,i,j,k,l) \
+ PFmil_step ((a), (b), (c), (d), (e), (f), (g), (h), (i), (j), (k), (l))
#define merge_adjacent(a,b,c,d) PFmil_merge_adjacent ((a), (b), (c), (d))
#define string_join(a,b) PFmil_string_join ((a), (b))
Index: mil.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- mil.h 18 Mar 2008 14:27:43 -0000 1.58
+++ mil.h 20 Mar 2008 10:55:12 -0000 1.59
@@ -33,7 +33,7 @@
#define MIL_H
/** maximum number of children of a MIL tree node */
-#define MIL_MAXCHILD 11
+#define MIL_MAXCHILD 12
/** MIL oid's are unsigned integers */
typedef unsigned int oid;
@@ -797,11 +797,11 @@
/* ---------- general purpose staircase join ---------- */
PFmil_t * PFmil_step (const PFmil_t *axis, const PFmil_t *test,
- const PFmil_t *iter, const PFmil_t *item,
- const PFmil_t *frag, const PFmil_t *ws,
- const PFmil_t *ord, const PFmil_t *kind,
- const PFmil_t *ns, const PFmil_t *loc,
- const PFmil_t *tgt);
+ const PFmil_t *iter, const PFmil_t *frag,
+ const PFmil_t *pre, const PFmil_t *attr,
+ const PFmil_t *ws, const PFmil_t *ord,
+ const PFmil_t *kind, const PFmil_t *ns,
+ const PFmil_t *loc, const PFmil_t *tgt);
PFmil_t * PFmil_merge_adjacent (const PFmil_t *, const PFmil_t *,
const PFmil_t *, const PFmil_t *);
-------------------------------------------------------------------------
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
