Zorba

Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11049
Merged at revision: 11350
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 35 lines (+2/-1)
3 files modified
ChangeLog (+1/-0)
src/compiler/expression/expr_type.cpp (+1/-0)
test/fots/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+157659@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-08T14-09-49.73Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job markos-scratch-2013-04-08T14-09-49.73Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-04-08 08:45:18 +0000
3+++ ChangeLog 2013-04-08 14:07:24 +0000
4@@ -66,6 +66,7 @@
5 * Fixed bug #1099535 (xml:parse endless loop)
6 * Fixed bug in optimizing fn:count over general-index probes
7 * Fixed bug #866958 (Parsing error not explicit enough)
8+ * Fixed bug in computing the static type of a self-axis path step.
9 * Fixed bug #867068: (Incorrect usage of XQDY0027)
10 * Fixed bug: jsoniq constructor should not be const-folded
11 * Fixed bug #1152834 (bug in computing the scripting kind of array and object
12
13=== modified file 'src/compiler/expression/expr_type.cpp'
14--- src/compiler/expression/expr_type.cpp 2013-03-27 09:00:05 +0000
15+++ src/compiler/expression/expr_type.cpp 2013-04-08 14:07:24 +0000
16@@ -991,6 +991,7 @@
17 }
18
19 if (testNodeName != NULL &&
20+ nodeTest->getWildKind() == match_no_wild &&
21 inNodeName != NULL &&
22 !inNodeName->equals(testNodeName))
23 {
24
25=== modified file 'test/fots/CMakeLists.txt'
26--- test/fots/CMakeLists.txt 2013-04-08 11:38:48 +0000
27+++ test/fots/CMakeLists.txt 2013-04-08 14:07:24 +0000
28@@ -305,7 +305,6 @@
29 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes115 0)
30 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes117 0)
31 EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-childAxis-001 0)
32-EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-wild-002 0)
33 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
34 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
35 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)

Subscribers

People subscribed via source and target branches