Update of /cvsroot/monetdb/pathfinder/compiler/debug
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16065/debug
Modified Files:
logdebug.c
Log Message:
-- print all fun_call information to the XML output.
-- Extend XML import to cope with fun_calls.
U logdebug.c
Index: logdebug.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/debug/logdebug.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- logdebug.c 10 Mar 2009 12:20:42 -0000 1.124
+++ logdebug.c 6 May 2009 21:32:38 -0000 1.125
@@ -2372,22 +2372,48 @@
case la_fun_call:
PFarray_printf (xml,
" <content>\n"
- " <function uri=\"%s\" name=\"%s\"/>\n"
+ " <function");
+ if (PFqname_uri (n->sem.fun_call.qname))
+ PFarray_printf (xml,
+ " uri=\"%s\"",
+ PFqname_uri (n->sem.fun_call.qname));
+ PFarray_printf (xml,
+ " name=\"%s\"/>\n"
" <kind name=\"%s\"/>\n"
" <column name=\"%s\" function=\"iter\"/>\n"
- " </content>\n",
- PFqname_uri (n->sem.fun_call.qname),
+ " <output min=\"%i\" max=\"%i\">\n",
PFqname_loc (n->sem.fun_call.qname),
PFalg_fun_call_kind_str (n->sem.fun_call.kind),
- PFcol_str (n->sem.fun_call.iter));
+ PFcol_str (n->sem.fun_call.iter),
+ n->sem.fun_call.occ_ind == alg_occ_exactly_one ||
+ n->sem.fun_call.occ_ind == alg_occ_one_or_more
+ ? 1 : 0,
+ n->sem.fun_call.occ_ind == alg_occ_zero_or_one ||
+ n->sem.fun_call.occ_ind == alg_occ_exactly_one
+ ? 1 : 2);
+ for (c = 0; c < n->schema.count; c++)
+ PFarray_printf (xml,
+ " <column name=\"%s\""
+ " type=\"%s\""
+ " position=\"%u\"/>\n",
+ PFcol_str (n->schema.items[c].name),
+ PFalg_simple_type_str
(n->schema.items[c].type),
+ c);
+ PFarray_printf (xml,
+ " </output>\n"
+ " </content>\n");
break;
case la_fun_param:
PFarray_printf (xml, " <content>\n");
for (c = 0; c < n->schema.count; c++)
PFarray_printf (xml,
- " <column name=\"%s\"
position=\"%u\"/>\n",
- PFcol_str (n->schema.items[c].name), c);
+ " <column name=\"%s\""
+ " type=\"%s\""
+ " position=\"%u\"/>\n",
+ PFcol_str (n->schema.items[c].name),
+ PFalg_simple_type_str
(n->schema.items[c].type),
+ c);
PFarray_printf (xml, " </content>\n");
break;
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
