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: 11083
Merged at revision: 11414
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 40 lines (+7/-3)
2 files modified
src/compiler/translator/translator.cpp (+7/-1)
test/fots/CMakeLists.txt (+0/-2)
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+161331@code.launchpad.net

Commit message

count clause defines a new variables scope

Description of the change

count clause defines a new variables scope

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

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

Validation queue job markos-scratch-2013-04-28T16-29-50.639Z 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 'src/compiler/translator/translator.cpp'
2--- src/compiler/translator/translator.cpp 2013-04-27 13:42:09 +0000
3+++ src/compiler/translator/translator.cpp 2013-04-28 16:24:25 +0000
4@@ -6756,9 +6756,13 @@
5 pop_scope();
6 break;
7 }
8+ case flwor_clause::count_clause:
9+ {
10+ pop_scope();
11+ break;
12+ }
13 case flwor_clause::orderby_clause:
14 case flwor_clause::where_clause:
15- case flwor_clause::count_clause:
16 {
17 break;
18 }
19@@ -7756,6 +7760,8 @@
20 {
21 TRACE_VISIT_OUT();
22
23+ push_scope();
24+
25 var_expr* varExpr = bind_var(loc, v.get_varname(), var_expr::count_var, NULL);
26
27 count_clause* clause = theExprManager->create_count_clause(theRootSctx,
28
29=== modified file 'test/fots/CMakeLists.txt'
30--- test/fots/CMakeLists.txt 2013-04-27 14:31:20 +0000
31+++ test/fots/CMakeLists.txt 2013-04-28 16:24:25 +0000
32@@ -294,8 +294,6 @@
33 EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
34 EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0)
35 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)
36-EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0)
37-EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0)
38 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0)
39 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)
40 EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)

Subscribers

People subscribed via source and target branches