Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31560/mil
Modified Files:
Tag: XQuery_0-24
milgen.brg
Log Message:
-- fixed MIL code generation that was never used before
(implementing #pf:merge-adjacent-text-nodes for a mixed sequence of nodes)
U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.157.2.4
retrieving revision 1.157.2.5
diff -u -d -r1.157.2.4 -r1.157.2.5
--- milgen.brg 29 May 2008 07:19:27 -0000 1.157.2.4
+++ milgen.brg 29 May 2008 16:42:29 -0000 1.157.2.5
@@ -8178,7 +8178,7 @@
p_cont := leftfetchjoin (sel, frag); */
execute (
assgn (var (sel->name),
- hmark (select_ (var (attr->name), lit_bit (false)),
+ hmark (select_ (var (attr->name), lit_bit (true)),
lit_oid (0))),
assgn (var (p_pre->name),
leftfetchjoin (var (sel->name),
@@ -8199,7 +8199,7 @@
a_cont := leftfetchjoin (sel, frag); */
execute (
assgn (var (sel->name),
- hmark (select_ (var (attr->name), lit_bit (true)),
+ hmark (select_ (var (attr->name), lit_bit (false)),
lit_oid (0))),
assgn (var (a_pre->name),
leftfetchjoin (var (sel->name),
@@ -8254,7 +8254,7 @@
mvar_t *mu = new_var (1),
*attr = new_var (p->refctr);
- env_add (p->env, item_att, aat_frag, attr);
+ env_add (p->env, item_att, aat_attr, attr);
/* Attributes have to appear before the other nodes.
Otherwise the node constructors may fail.
@@ -8262,15 +8262,16 @@
as we split them up anyway.) */
execute (
assgn (var (mu->name),
- arg (var (a_iter->name),
- arg (var (iter->name),
- arg (var (a_pre->name),
- arg (var (pre->name),
- arg (var (a_attr->name),
- arg (project (var (iter->name),
- cast (type (mty_oid), nil ())),
- arg (var (a_cont->name),
- var (frag->name))))))))),
+ merged_union (
+ arg (var (a_iter->name),
+ arg (var (iter->name),
+ arg (var (a_pre->name),
+ arg (var (pre->name),
+ arg (var (a_attr->name),
+ arg (project (var (iter->name),
+ cast (type (mty_oid), nil ())),
+ arg (var (a_cont->name),
+ var (frag->name)))))))))),
assgn (var (iter->name),
fetch (var (mu->name), lit_int (0))),
assgn (var (pre->name),
-------------------------------------------------------------------------
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
