Merge lp:~zorba-coders/zorba/markos_fots into lp:zorba

Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11255
Merged at revision: 11262
Proposed branch: lp:~zorba-coders/zorba/markos_fots
Merge into: lp:zorba
Diff against target: 40 lines (+7/-1)
3 files modified
ChangeLog (+1/-0)
src/compiler/translator/translator.cpp (+6/-0)
test/fots/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos_fots
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+150687@code.launchpad.net

Commit message

throw XQST0048 for groupby clause, as specified by XQuery 3.0

Description of the change

throw XQST0048 for groupby clause, as specified by XQuery 3.0

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 :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/markos_fots into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job markos_fots-2013-02-26T22-45-45.584Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

lp:~zorba-coders/zorba/markos_fots updated
11255. By Markos Zaharioudakis

throw XQST0048 for groupby clause, as specified by XQuery 3.0

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

Validation queue job markos_fots-2013-02-26T23-16-43.673Z 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-02-23 14:51:30 +0000
3+++ ChangeLog 2013-02-26 23:13:23 +0000
4@@ -31,6 +31,7 @@
5 * Fixed bug #1132032 (Certain regexes involving ^ should be legal)
6 * Fixed bug #1023168 (Non-single-char-escapes in regex character ranges not
7 caught)
8+ * Throw XQST0048 for groupby clause, as specified by XQuery 3.0.
9 * Fixed bug #866874 (regex "range subtraction" not supported for ICU)
10 * Fixed bug in computing the static type of an allowing-empty FOR variable.
11 * Fixed bug #1099648 and #1088886 (XML parsing failures on Red Hat)
12
13=== modified file 'src/compiler/translator/translator.cpp'
14--- src/compiler/translator/translator.cpp 2013-02-09 00:26:52 +0000
15+++ src/compiler/translator/translator.cpp 2013-02-26 23:13:23 +0000
16@@ -6881,6 +6881,12 @@
17 if (spec->get_binding_expr() == NULL)
18 {
19 ve = lookup_var(varname, loc, true);
20+
21+ if (all_vars.find(ve) == all_vars.end())
22+ {
23+ RAISE_ERROR(err::XQST0094, loc,
24+ ERROR_PARAMS(ve->get_name()->getStringValue()));
25+ }
26 }
27 else
28 {
29
30=== modified file 'test/fots/CMakeLists.txt'
31--- test/fots/CMakeLists.txt 2013-02-26 02:14:13 +0000
32+++ test/fots/CMakeLists.txt 2013-02-26 23:13:23 +0000
33@@ -725,7 +725,6 @@
34 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
35 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
36 EXPECTED_FOTS_FAILURE (prod-GroupByClause group-013 0)
37-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-014 0)
38 EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr012 0)
39 EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr017 0)
40 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)

Subscribers

People subscribed via source and target branches