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

[Markos Zaharioudakis]

count clause defines a new variables scope

count clause defines a new variables scope

[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-scratch-2013-04-28T16-29-50.639Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-04-28T16-29-50.639Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-04-27 13:42:09 +0000
+++ src/compiler/translator/translator.cpp	2013-04-28 16:24:25 +0000
@@ -6756,9 +6756,13 @@
       pop_scope();
       break;
     }
+    case flwor_clause::count_clause:
+    {
+      pop_scope();
+      break;
+    }
     case flwor_clause::orderby_clause:
     case flwor_clause::where_clause:
-    case flwor_clause::count_clause:
     {
       break;
     }
@@ -7756,6 +7760,8 @@
 {
   TRACE_VISIT_OUT();
 
+  push_scope();
+
   var_expr* varExpr = bind_var(loc, v.get_varname(), var_expr::count_var, NULL);
 
   count_clause* clause = theExprManager->create_count_clause(theRootSctx,
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-27 14:31:20 +0000
+++ test/fots/CMakeLists.txt	2013-04-28 16:24:25 +0000
@@ -294,8 +294,6 @@
 EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
 EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0)
 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)
-EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0)
-EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0)
 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0)
 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)
 EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)