Update of /cvsroot/monetdb/pathfinder/compiler/semantics
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv746/compiler/semantics
Modified Files:
Tag: Nov2009
heuristic.c xquery_fo.c
Log Message:
- fix handling of non-string values in heuristic rewrite for index lookup
Index: xquery_fo.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/semantics/xquery_fo.c,v
retrieving revision 1.186.4.1
retrieving revision 1.186.4.2
diff -u -d -r1.186.4.1 -r1.186.4.2
--- xquery_fo.c 7 Oct 2009 13:48:18 -0000 1.186.4.1
+++ xquery_fo.c 16 Nov 2009 23:29:21 -0000 1.186.4.2
@@ -2575,12 +2575,6 @@
PFty_xs_string () },
.ret_ty = PFty_star( PFty_xs_anyNode()) } },
.alg = PFbui_pf_text }
- , /* pf:supernode (node()*) as node()* */
- { .ns = PFns_lib, .loc = "supernode",
- .arity = 1, .sig_count = 1, .sigs = { {
- .par_ty = (PFty_t[]) { PFty_star( PFty_xs_anyNode ()) },
- .ret_ty = PFty_star( PFty_xs_anyNode ()) } },
- .alg = PFbui_pf_supernode }
, /* pf:add-doc (string, string) as docmgmt */
{ .ns = PFns_lib, .loc = "add-doc",
.arity = 2, .sig_count = 1, .sigs = { {
Index: heuristic.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/semantics/heuristic.c,v
retrieving revision 1.15.6.5
retrieving revision 1.15.6.6
diff -u -d -r1.15.6.5 -r1.15.6.6
--- heuristic.c 16 Nov 2009 18:18:21 -0000 1.15.6.5
+++ heuristic.c 16 Nov 2009 23:29:21 -0000 1.15.6.6
@@ -291,14 +291,12 @@
return r;
}
-/*
static PFpnode_t*
seq_ty_(PFloc_t loc, PFpnode_t *a) {
PFpnode_t *r = p_wire1(p_seq_ty, loc, a);
if (r) r->sem.kind = p_kind_node;
return r;
}
-*/
#define cpy(cur) cpy_subst(cur,NULL,NULL,NULL)
#define subst(cur,src,dst) cpy_subst(cur,src,dst,NULL)
@@ -642,18 +640,15 @@
let(var_type(cpy(VAR2)),
flwr(binds(bind(vars(cpy(VAR3)),EXPR1), nil),
where(nil, ord_ret(nil,
- apply("fn", "string", args(cpy(VAR3), nil)))))),
-/*
if_then(instof(cpy(VAR3), seq_ty(node_ty(p_kind_node,
nil))),
then_else(apply("fn", "data", args(cpy(VAR3), nil)),
- cpy(VAR3)))
-*/
+ cpy(VAR3))))))),
binds(
let(var_type(cpy(VAR4)),
flwr(binds(bind(vars(cpy(VAR5)), cpy(VAR2)), nil),
where(nil, ord_ret(nil,
apply("pf",(tst == TST_ATTR)?"attribute":"text",
- args(cpy(VAR5), arg)))))), nil)));
+ args(apply("fn", "string", args(cpy(VAR5), nil)),
arg)))))), nil)));
/* pattern(2): put in VBIND any remaining variable bindings after $x */
if (VBIND) {
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
