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

[Markos Zaharioudakis]

throw XQST0048 for groupby clause, as specified by XQuery 3.0

throw XQST0048 for groupby clause, as specified by XQuery 3.0

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos_fots-2013-02-26T22-45-45.584Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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]

11255. By Markos Zaharioudakis on 2013-02-26

throw XQST0048 for groupby clause, as specified by XQuery 3.0

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos_fots-2013-02-26T23-16-43.673Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos_fots-2013-02-26T23-16-43.673Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-02-23 14:51:30 +0000
+++ ChangeLog	2013-02-26 23:13:23 +0000
@@ -31,6 +31,7 @@
   * Fixed bug #1132032 (Certain regexes involving ^ should be legal)
   * Fixed bug #1023168 (Non-single-char-escapes in regex character ranges not
     caught)
+  * Throw XQST0048 for groupby clause, as specified by XQuery 3.0.
   * Fixed bug #866874 (regex "range subtraction" not supported for ICU)
   * Fixed bug in computing the static type of an allowing-empty FOR variable.
   * Fixed bug #1099648 and #1088886 (XML parsing failures on Red Hat)
 
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-02-09 00:26:52 +0000
+++ src/compiler/translator/translator.cpp	2013-02-26 23:13:23 +0000
@@ -6881,6 +6881,12 @@
     if (spec->get_binding_expr() == NULL)
     {
       ve = lookup_var(varname, loc, true);
+
+      if (all_vars.find(ve) == all_vars.end())
+      {
+        RAISE_ERROR(err::XQST0094, loc,
+        ERROR_PARAMS(ve->get_name()->getStringValue()));
+      }
     }
     else
     {
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-02-26 02:14:13 +0000
+++ test/fots/CMakeLists.txt	2013-02-26 23:13:23 +0000
@@ -725,7 +725,6 @@
 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
 EXPECTED_FOTS_FAILURE (prod-GroupByClause group-013 0)
-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-014 0)
 EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr012 0)
 EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr017 0)
 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)