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

Modified Files:
      Tag: XQuery_0-24
        fs.brg 
Log Message:
* fix the replace-element update function
  - the core translation was not casting the uA to string when constracting
    a text node,
  - the assert was asserting aat_str instead of aat_pnode.
* made the findnodes milgen code slightly more compact.


U fs.brg
Index: fs.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/fs.brg,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -u -d -r1.68 -r1.68.2.1
--- fs.brg      3 Apr 2008 07:26:31 -0000       1.68
+++ fs.brg      28 May 2008 11:08:17 -0000      1.68.2.1
@@ -3409,7 +3409,7 @@
                  * let $target := [[ <TargetExpr> ]] return
                  *   typeswitch ($target)
                  *     case $e as xs:anyElement return
-                 *       let $textnode := text { $step1 }
+                 *       let $textnode := text { $step1 cast as xs:string? }
                  *       return upd:replaceElementContent ($e, $textnode)
                  *     case $a as xs:anyAttribute return
                  *       upd:replaceValue ($a, $step1)
@@ -3450,7 +3450,8 @@
                             let (letbind (var (string), fn_data (var (expr))),
                                 let (letbind (var (step1),
                                               APPLY (is2uA, var (string))),
-                                    let (letbind (var (target), 
APPLY(exactly_one, C(L(p)))),
+                                    let (letbind (var (target),
+                                                  APPLY(exactly_one, C(L(p)))),
                                          nil())))),
                         typeswitch (
                             var (target),
@@ -3464,8 +3465,11 @@
                                                         PFty_xs_anyElement ()),
                                                     var (target))),
                                         let (letbind (var (textnode),
-                                                      constr (p_text,
-                                                              var (step1))),
+                                                constr (p_text,
+                                                    cast (seqtype (
+                                                        PFty_opt (
+                                                            PFty_xs_string 
())),
+                                                        var (step1)))),
                                         nil ())),
                                         APPLY (replCont, var (e),
                                                var (textnode)))),


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