Update of /cvsroot/monetdb/pathfinder/compiler/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29141/core

Modified Files:
      Tag: XQuery_0-24
        coreopt.brg 
Log Message:
-- fixed incorrect subtype check for function #pf:merge-adjacent-text-nodes
   that led to the incorrect removal of the function.


U coreopt.brg
Index: coreopt.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/coreopt.brg,v
retrieving revision 1.67.2.2
retrieving revision 1.67.2.3
diff -u -d -r1.67.2.2 -r1.67.2.3
--- coreopt.brg 29 May 2008 12:02:24 -0000      1.67.2.2
+++ coreopt.brg 29 May 2008 16:41:16 -0000      1.67.2.3
@@ -1275,7 +1275,7 @@
                    argument does not contain text nodes. */
                 else if (LL(p)->kind == c_seq) {
                     if (!PFty_subtype (PFty_opt (PFty_text ()),
-                                       TY(LLL(p)))) {
+                                       PFty_opt (PFty_prime (TY(LLL(p)))))) {
                         PFfun_t *pf_matn
                             = function (
                                   PFqname (
@@ -1295,7 +1295,7 @@
                          */
                         PFcoreopt_label (p);
                     } else if (!PFty_subtype (PFty_opt (PFty_text ()),
-                                              TY(LLR(p)))) {
+                                              PFty_opt (PFty_prime 
(TY(LLR(p)))))) {
                         PFfun_t *pf_matn
                             = function (
                                   PFqname (


-------------------------------------------------------------------------
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

Reply via email to