Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13190
Modified Files:
Tag: xquery-decomposition
milprint_summer.c
Log Message:
We don't need the set of referred items separately, the fun_item already
contain them.
Index: milprint_summer.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint_summer.c,v
retrieving revision 1.409.2.8
retrieving revision 1.409.2.9
diff -u -d -r1.409.2.8 -r1.409.2.9
--- milprint_summer.c 6 Mar 2008 15:31:32 -0000 1.409.2.8
+++ milprint_summer.c 8 Mar 2008 21:10:39 -0000 1.409.2.9
@@ -6247,11 +6247,9 @@
* / \
* var(returned) arg
* / \
- * var(referred) arg
+ * var(upath) arg
* / \
- * var(upath) arg
- * / \
- * var(rpath) args
+ * var(rpath) args
*
* @param apply the function application information
* @param args the head of the argument list
@@ -6263,7 +6261,7 @@
PFcnode_t *dsts = L(xrpc);
PFcnode_t *funApp = R(xrpc);
PFfun_t *fun = NULL;
- PFcnode_t *used = NULL, *returned = NULL, *refed = NULL;
+ PFcnode_t *used = NULL, *returned = NULL;
PFcnode_t *upath = NULL, *rpath = NULL, *args = NULL;
/* Find function application */
@@ -6271,10 +6269,9 @@
fun = funApp->sem.fun;
used = L(D(funApp));
returned = L(R(D(funApp)));
- refed = L(R(R(D(funApp))));
- upath = L(R(R(R(D(funApp)))));
- rpath = L(R(R(R(R(D(funApp))))));
- args = R(R(R(R(R(D(funApp))))));
+ upath = L(R(R(D(funApp))));
+ rpath = L(R(R(R(D(funApp)))));
+ args = R(R(R(R(D(funApp)))));
if (R(xrpc)->kind != c_apply){
funApp->kind = c_nil;
@@ -6346,20 +6343,6 @@
" # end of translate returned nodes\n");
milprintf(f,
- " # begin of translate referred nodes\n");
- rc = translate2MIL (f, NORMAL, cur_level, counter, returned);
- if (rc == NORMAL){
- milprintf(f, " var referred_item := item.materialize(ipik);\n");
- } else {
- milprintf(f, " var referred_item := item%s.materialize(ipik);\n",
- kind_str(rc));
- }
- milprintf(f,
- " var referred_iter := iter.materialize(ipik);\n"
- " var referred_kind := kind.materialize(ipik);\n"
- " # end of translate referred nodes\n");
-
- milprintf(f,
" # begin of translate used paths\n");
rc = translate2MIL (f, NORMAL, cur_level, counter, upath);
if (rc == NORMAL){
@@ -6455,7 +6438,6 @@
" ws, rpc_dsts,\n"
" used_iter, used_item, used_kind, \n"
" returned_iter, returned_item,
returned_kind,\n"
- " referred_iter, referred_item,
referred_kind,\n"
" upath_iter, upath_item, \n"
" rpath_iter, rpath_item, \n"
" fun_vid%03u, fun_iter%03u,\n"
-------------------------------------------------------------------------
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
