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: 10965
Merged at revision: 11097
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 41 lines (+8/-2)
4 files modified
ChangeLog (+2/-1)
src/runtime/core/path_iterators.cpp (+1/-1)
test/rbkt/ExpQueryResults/zorba/paths/preceding_pred_01.xml.res (+1/-0)
test/rbkt/Queries/zorba/paths/preceding_pred_01.xq (+4/-0)
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+129385@code.launchpad.net

Commit message

Fixed bug #1065175 (preceding::node()[1] returns wrong results)

Description of the change

Fixed bug #1065175 (preceding::node()[1] returns wrong results)

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-2012-10-12T10-51-45.772Z/log.html

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

Validation queue job markos-scratch-2012-10-12T10-51-45.772Z 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 2012-10-09 16:41:44 +0000
3+++ ChangeLog 2012-10-12 10:48:35 +0000
4@@ -11,7 +11,8 @@
5 * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
6 * Fixed bug #1062093 (bug in var reference iterators with an associated
7 position that is negative)
8- * Fixed bug #1061222 (bad message for errors in index key type declaration)
9+ * Fixed bug #1061222 (bad message for errors in index key type declaration)
10+ * Fixed bug #1065175 (preceding::node()[1] returns wrong results)
11 * Fixed bug #1021492 (while computeing the "sources" of a prolog var, skip
12 any var-setting exprs that appear in non-used (and non-optimized) functions).
13
14
15=== modified file 'src/runtime/core/path_iterators.cpp'
16--- src/runtime/core/path_iterators.cpp 2012-09-19 21:16:15 +0000
17+++ src/runtime/core/path_iterators.cpp 2012-10-12 10:48:35 +0000
18@@ -1788,7 +1788,7 @@
19 // We have traversed all the subtrees of the node D that is at the
20 // top of theCurrentPath. Return D to the caller, if it satifies the
21 // node test, and then pop D from theCurrentPath.
22- if (nameOrKindTest(theSctx, state->topNode(), loc))
23+ if (!getNextContextNode && nameOrKindTest(theSctx, state->topNode(), loc))
24 {
25 result = state->topNode();
26 STACK_PUSH(true, state);
27
28=== added file 'test/rbkt/ExpQueryResults/zorba/paths/preceding_pred_01.xml.res'
29--- test/rbkt/ExpQueryResults/zorba/paths/preceding_pred_01.xml.res 1970-01-01 00:00:00 +0000
30+++ test/rbkt/ExpQueryResults/zorba/paths/preceding_pred_01.xml.res 2012-10-12 10:48:35 +0000
31@@ -0,0 +1,1 @@
32+B
33
34=== added file 'test/rbkt/Queries/zorba/paths/preceding_pred_01.xq'
35--- test/rbkt/Queries/zorba/paths/preceding_pred_01.xq 1970-01-01 00:00:00 +0000
36+++ test/rbkt/Queries/zorba/paths/preceding_pred_01.xq 2012-10-12 10:48:35 +0000
37@@ -0,0 +1,4 @@
38+
39+<a><b>B</b><c/></a>/c/preceding::node()[1]
40+
41+

Subscribers

People subscribed via source and target branches