Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22030/compiler/algebra/prop

Modified Files:
        prop_ocol.c 
Log Message:
propagated changes of Thursday Jun 12 2008 - Friday Jun 13 2008
from the XQuery_0-24 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - sjoerd:
        NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj,1.4.2.1
Updated installer version number.
Make sure the 64 bit version and the 32 bit version have different "Upgrade 
Codes" so that they can be installed at the same time.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - lsidir: compiler/algebra/algebra.c,1.84.2.3
        compiler/algebra/builtins.c,1.95.2.4
        compiler/algebra/logical.c,1.98.2.4
        compiler/algebra/physical.c,1.69.2.3
        compiler/algebra/prop/prop_ocol.c,1.60.2.2
        compiler/include/algebra.h,1.85.2.2 compiler/mil/milgen.brg,1.157.2.15
        compiler/sql/lalg2sql.brg,1.133.2.1
pf:docname implementation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - sjoerd:
        NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj,1.12.2.1
Updated installer version number.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


U prop_ocol.c
Index: prop_ocol.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_ocol.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- prop_ocol.c 30 May 2008 09:41:42 -0000      1.61
+++ prop_ocol.c 13 Jun 2008 12:50:45 -0000      1.62
@@ -511,6 +511,15 @@
                     res_type = aat_str;
                     break;
 
+                case alg_fun_pf_docname:
+                    assert(n->sem.fun_1to1.refs.count == 1);
+
+                    /* make sure atts are of the correct type */
+                    assert(ocol_at (L(n), ix[0]).type & aat_node);
+
+                    res_type = aat_str;
+                    break;
+
                 case alg_fun_upd_delete:
                     assert(n->sem.fun_1to1.refs.count == 1);
                     /* make sure that the attribute is a node */


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to