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.

Commit message:
Fixed bug in computing the static type of a self-axis path step.

Requested reviews:
  Markos Zaharioudakis (markos-za)

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

Fixed bug in computing the static type of a self-axis path step.
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/157659
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2013-04-08 08:45:18 +0000
+++ ChangeLog	2013-04-08 14:07:24 +0000
@@ -66,6 +66,7 @@
   * Fixed bug #1099535  (xml:parse endless loop)
   * Fixed bug in optimizing fn:count over general-index probes
   * Fixed bug #866958  (Parsing error not explicit enough)
+  * Fixed bug in computing the static type of a self-axis path step.
   * Fixed bug #867068: (Incorrect usage of XQDY0027)
   * Fixed bug: jsoniq constructor should not be const-folded
   * Fixed bug #1152834 (bug in computing the scripting kind of array and object

=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp	2013-03-27 09:00:05 +0000
+++ src/compiler/expression/expr_type.cpp	2013-04-08 14:07:24 +0000
@@ -991,6 +991,7 @@
     }
 
     if (testNodeName != NULL &&
+        nodeTest->getWildKind() == match_no_wild &&
         inNodeName != NULL &&
         !inNodeName->equals(testNodeName))
     {

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-08 11:38:48 +0000
+++ test/fots/CMakeLists.txt	2013-04-08 14:07:24 +0000
@@ -305,7 +305,6 @@
 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes115 0)
 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes117 0)
 EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-childAxis-001 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-wild-002 0)
 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)