[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch 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-scratch-2013-04-29T00-52-51.209Z is finished. The final status was: 43 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-29T00-52-51.209Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: Fixed resolution of annotation qnames Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 Fixed resolution of annotation qnames -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161352 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-04-28T16-29-50.639Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-28T16-29-50.639Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
count clause defines a new variables scope
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331
count clause defines a new variables scope
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161331
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-04-27 13:42:09 +
+++ src/compiler/translator/translator.cpp 2013-04-28 16:24:25 +
@@ -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 +
+++ test/fots/CMakeLists.txt 2013-04-28 16:24:25 +
@@ -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)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
