zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/104502

Fixed bug in MarkNodeCopyProps rule (static cast to replace_expr without chaing the expr kind first)  
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/104502
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2012-05-02 23:50:50 +0000
+++ ChangeLog	2012-05-03 09:15:25 +0000
@@ -29,6 +29,7 @@
   * Fixed bug #967864 (var substitution did not update theFreeVars property)
   * Fixed bug #891650 (context size var not always declared within path expr)
   * Fixed bug #948879 (--uri-path doesn't work with fetch:content())
+  * Fixed bug in MarkNodeCopyProps rule (static cast to replace_expr without chaing the expr kind first)  
   * Fixed bug in window iterator (binding the end vars in the output tuple stream)
   * Fixed bug #866547 (protect index-join rule from general flwor)
   * Fixed bug #867253 (cdml:delete-nodes should only remove root nodes)

=== modified file 'src/compiler/rewriter/rules/nodeid_rules.cpp'
--- src/compiler/rewriter/rules/nodeid_rules.cpp	2012-04-24 12:39:38 +0000
+++ src/compiler/rewriter/rules/nodeid_rules.cpp	2012-05-03 09:15:25 +0000
@@ -770,7 +770,8 @@
 
     if (e->getSourceExpr() != NULL &&
         (e->get_expr_kind() == insert_expr_kind ||
-         static_cast<replace_expr*>(e)->getType() == store::UpdateConsts::NODE) &&
+         (e->get_expr_kind() == replace_expr_kind &&
+          static_cast<replace_expr*>(e)->getType() == store::UpdateConsts::NODE)) &&
         (sctx->inherit_mode() != StaticContextConsts::no_inherit_ns ||
          sctx->preserve_mode() != StaticContextConsts::no_preserve_ns))
     {