[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1169191 into lp:zorba
Validation queue job bug-1169191-2013-04-16T06-49-41.896Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 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/bug-1169191 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1169191 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Commit Message changed to: 1. Fixed problem with function items associated with contextual builtin functions 2. Fixed casting to xs:idrefs, xs:entities, and xs:nmtokens" For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Description changed to: 1. Fixed problem with function items associated with contextual builtin functions 2. Fixed casting to xs:idrefs, xs:entities, and xs:nmtokens" For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T07-47-54.403Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-next 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 hof-next-2013-04-16T07-47-54.403Z is finished. The final status was: 3 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/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T08-44-52.794Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/bug-1111487 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-487/+merge/145868 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/hof-next into lp:zorba
Validation queue job hof-next-2013-04-16T08-44-52.794Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/bug-1111487 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-487 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-487/+merge/145868 -- https://code.launchpad.net/~zorba-coders/zorba/bug-487/+merge/145868 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/hof-next into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/bug-1111487 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-487-2013-04-16T09-27-11.147Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-487/+merge/145868 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/bug-1111487 into lp:zorba
Validation queue job bug-487-2013-04-16T09-27-11.147Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-487/+merge/145868 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/bug-1111487 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-487 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-487/+merge/145868 -- https://code.launchpad.net/~zorba-coders/zorba/bug-487/+merge/145868 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T09-53-07.572Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
Validation queue job hof-next-2013-04-16T09-53-07.572Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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:~paul-lucas/zorba/bug-1085408 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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:~paul-lucas/zorba/bug-1085408 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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:~paul-lucas/zorba/bug-1085408 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1085408-2013-04-16T13-12-02.236Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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:~paul-lucas/zorba/bug-1085408 into lp:zorba
Validation queue job bug-1085408-2013-04-16T13-12-02.236Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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:~paul-lucas/zorba/bug-1085408 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-04-16T20-02-45.412Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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/hof-next into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/hof-next into lp:zorba. Commit message: fixes for fn:function-lookup + HOF cleanup Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 fixes for fn:function-lookup + HOF cleanup -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/compiler/codegen/plan_visitor.cpp' --- src/compiler/codegen/plan_visitor.cpp 2013-04-10 21:01:35 + +++ src/compiler/codegen/plan_visitor.cpp 2013-04-16 20:07:32 + @@ -477,6 +477,8 @@ { if (!v.get_is_global_var()[i]) fnInfo->theScopedVarsIterators.push_back(pop_itstack()); + else if (fnInfo->theScopedVarsValues[i] != NULL) +pop_itstack(); } std::reverse(fnInfo->theScopedVarsIterators.begin(), @@ -558,14 +560,7 @@ bool isPartialApply = false; - // the arguments are reversed on the stack - if (v.get_dot_var()) - { -PlanIter_t iter = pop_itstack(); -argIters.push_back(iter); - } - - for (size_t i = 0; i < numArgs-1; ++i) + for (csize i = 0; i < numArgs-1; ++i) { if (v.get_args()[i]->get_expr_kind() == argument_placeholder_expr_kind) isPartialApply = true; @@ -577,10 +572,7 @@ std::reverse(argIters.begin(), argIters.end()); - push_itstack(new DynamicFnCallIterator(sctx, qloc, - argIters, - v.get_dot_var() ? 1 : 0, - isPartialApply)); + push_itstack(new DynamicFnCallIterator(sctx, qloc, argIters, isPartialApply)); } === modified file 'src/compiler/expression/expr_clone.cpp' --- src/compiler/expression/expr_clone.cpp 2013-03-27 09:00:05 + +++ src/compiler/expression/expr_clone.cpp 2013-04-16 20:07:32 + @@ -358,19 +358,12 @@ newArgs.push_back((*ite)->clone(udf, subst)); } -expr* newDotVar = NULL; -if (e->theDotVar) -{ - newDotVar = e->theDotVar->clone(udf, subst); -} - newExpr = theCCB->theEM-> create_dynamic_function_invocation_expr(theSctx, udf, theLoc, e->theExpr->clone(udf, subst), -newArgs, -newDotVar); +newArgs); break; } case argument_placeholder_expr_kind: @@ -389,7 +382,6 @@ e->theFunctionItemInfo->theFunction, e->theFunctionItemInfo->theArity, e->is_inline(), - e->needs_context_item(), e->is_coercion()); std::vector::const_iterator varIter = === modified file 'src/compiler/expression/expr_iter.cpp' --- src/compiler/expression/expr_iter.cpp 2013-03-26 21:26:20 + +++ src/compiler/expression/expr_iter.cpp 2013-04-16 20:07:32 + @@ -706,10 +706,12 @@ theArgsIter = fiExpr->theFunctionItemInfo->theScopedVarsValues.begin(); theArgsEnd = fiExpr->theFunctionItemInfo->theScopedVarsValues.end(); + for (; theArgsIter != theArgsEnd; ++theArgsIter) { - if ( ! *theArgsIter) // TODO: the vars values for prolog variables is null, so they have to be skipped, or the optimizer will trip and fall off. Maybe null vars values need not be remembered + if ( ! *theArgsIter) continue; + EXPR_ITER_NEXT(*theArgsIter); } @@ -733,9 +735,6 @@ EXPR_ITER_NEXT(*theArgsIter); } -if (dfiExpr->theDotVar) - EXPR_ITER_NEXT(dfiExpr->theDotVar); - EXPR_ITER_END(); return; } === modified file 'src/compiler/expression/expr_manager.cpp' --- src/compiler/expression/expr_manager.cpp 2013-03-27 09:00:05 + +++ src/compiler/expression/expr_manager.cpp 2013-04-16 20:07:32 + @@ -790,11 +790,10 @@ user_function* udf, const QueryLoc& loc, expr* anExpr, -const std::vector& args, -expr* dotVar) +const std::vector& args) { CREATE_AND_RETURN_EXPR(dynamic_function_invocation_expr, sctx, udf, loc, - anExpr, args, dotVar); + anExpr, args); } @@ -813,13 +812,12 @@ user_function* udf, const QueryLoc& loc, function* f, -uint32_t arity, +csize arity, bool isInline, -bool needsContextItem, bool isCoercion) { CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc, - f, arity, isInline, needsContextItem, isCoercion); + f, arity, isInline, isCoercion); } @@ -828,11 +826,10 @@ user_function* udf, const QueryLoc& loc, bool isInline, -bool needsContextItem,
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/hof-next into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-04-16T20-02-45.412Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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/hof-next into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-next 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 hof-next-2013-04-16T20-32-12.463Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T20-32-12.463Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/bug1147563 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 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/hof-next into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T21-13-57.145Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/bug1100471 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1100471 into lp:zorba. Commit message: Solving windows warnings Requested reviews: Paul J. Lucas (paul-lucas) Related bugs: Bug #1100471 in Zorba: "Warnings on Windows" https://bugs.launchpad.net/zorba/+bug/1100471 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Solving windows warnings -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'include/zorba/xquery_exception.h' --- include/zorba/xquery_exception.h 2013-02-26 04:12:43 + +++ include/zorba/xquery_exception.h 2013-04-16 21:15:35 + @@ -295,7 +295,7 @@ * @return Returns \a true only if stack traces will be included. */ static bool get_print_trace( std::ostream &o ) { -return static_cast( o.iword( get_ios_trace_index() ) ); +return !!static_cast( o.iword( get_ios_trace_index() ) ); } /** @@ -404,7 +404,7 @@ */ inline std::ostream& operator<<( std::ostream &o, XQueryException::print_trace t ) { - XQueryException::set_print_trace( o, t ); + XQueryException::set_print_trace( o, !!t ); return o; } === modified file 'src/api/base64_streambuf.cpp' --- src/api/base64_streambuf.cpp 2013-02-07 17:24:36 + +++ src/api/base64_streambuf.cpp 2013-04-16 21:15:35 + @@ -156,8 +156,8 @@ // Get any chunk fragment pending the the get buffer first. // streamsize const n = min( gsize, size ); -traits_type::copy( to, gptr(), n ); -gbump( n ); +traits_type::copy( to, gptr(), static_cast(n) ); +gbump( static_cast(n) ); to += n; size -= n, return_size += n; } @@ -165,13 +165,13 @@ // // Must get bytes in terms of encoded size. // - size = base64::encoded_size( size ); + size = base64::encoded_size( static_cast(size) ); while ( size ) { char ebuf[ Large_External_Buf_Size ]; streamsize const get = min( (streamsize)(sizeof ebuf), size ); if ( streamsize got = orig_buf_->sgetn( ebuf, get ) ) { - streamsize const decoded = base64::decode( ebuf, got, to ); + streamsize const decoded = base64::decode( ebuf, static_cast(got), to ); to += decoded; size -= got, return_size += decoded; } else @@ -198,7 +198,7 @@ while ( size >= 3 ) { char ebuf[ Large_External_Buf_Size ]; streamsize const put = min( (streamsize)(sizeof ebuf), size ); -streamsize const encoded = base64::encode( from, put, ebuf ); +streamsize const encoded = base64::encode( from, static_cast(put), ebuf ); orig_buf_->sputn( ebuf, encoded ); from += put, size -= put, return_size += put; } @@ -207,8 +207,8 @@ // Put any remaining chunk fragment into the put buffer. // if ( size ) { -traits_type::copy( pbuf_, from, size ); -plen_ = size; +traits_type::copy( pbuf_, from, static_cast(size) ); +plen_ = static_cast(size); } return return_size; === modified file 'src/api/module_info_impl.cpp' --- src/api/module_info_impl.cpp 2013-02-15 06:02:54 + +++ src/api/module_info_impl.cpp 2013-04-16 21:15:35 + @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "stdafx.h" #include "api/module_info_impl.h" #include #include "zorbatypes/zstring.h" === modified file 'src/compiler/parser/jsoniq_parser.cpp' --- src/compiler/parser/jsoniq_parser.cpp 2013-04-16 06:58:24 + +++ src/compiler/parser/jsoniq_parser.cpp 2013-04-16 21:15:35 + @@ -30,6 +30,7 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +#include "stdafx.h" // Take the name prefix into account. #define yylex zorbalex @@ -207,12 +208,12 @@ if (*++yyp != '\\') goto do_not_strip_quotes; /* Fall through. */ +case '"': + return yyr; default: yyr += *yyp; break; -case '"': - return yyr; } do_not_strip_quotes: ; } @@ -247,11 +248,13 @@ { YYUSE (yylocationp); YYUSE (yyvaluep); +/* useless switch (yytype) { default: break; } +*/ } === modified file 'src/compiler/parser/jsoniq_scanner.cpp' --- src/compiler/parser/jsoniq_scanner.cpp 2013-04-16 06:58:24 + +++ src/compiler/parser/jsoniq_scanner.cpp 2013-04-16 21:15:35 + @@ -1,6 +1,7 @@ -#line 2 "jsoniq_scanner.yy.cpp" +#include "stdafx.h" +//#line 2 "jsoniq_scanner.yy.cpp" -#line 4 "jsoniq_scanner.yy.cpp" +//#line 4 "jsoniq_scanner.yy.cpp" #define YY_INT_ALIGNED short int @@ -6256,7 +6257,7 @@ if ( yyin->bad() ) return -1; else - return yyin->gcount(); + return static_cast(yyin->gcount()); #endif } === modified file 'src/compiler/parser/parser_helpers.cpp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100471 into lp:zorba
I corrected all size_types only one warning couldn't solve, I don't know how to solve this: 1>c:\dev\bug1100471\src\zorbatypes\integer.h(916): warning C4146: unary minus operator applied to unsigned type, result still unsigned (..\..\src\zorbatypes\integer.cpp) 1> c:\dev\bug1100471\src\zorbatypes\integer.h(915) : while compiling class template member function 'zorba::IntegerImpl zorba::IntegerImpl::operator -(void) const' 1> with 1> [ 1> IntType=unsigned __int64 1> ] 1> ..\..\src\zorbatypes\integer.cpp(453) : see reference to class template instantiation 'zorba::IntegerImpl' being compiled 1> with 1> [ 1> IntType=unsigned __int64 1> ] -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 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/bug1100471 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1100471 into lp:zorba has been updated. Commit Message changed to: Solving windows warnings For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 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/hof-next into lp:zorba
Validation queue job hof-next-2013-04-16T21-13-57.145Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159229 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/bug1100471 into lp:zorba
Review: Needs Fixing You don't hack the parser.cpp or lexer.cpp files directly. Please revert ALL changes to those files and modify the .y or .l files ONLY. If the warnings still persist in those files due to generated code, it's simply too bad. In general, you don't need to fully qualify casts, e.g., you can do static_cast(x) rather than static_cast(x). I've fixed several formatting things (to put the code back to my style) and also a few other things. You should also seek approval from whoever else's code you touch. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100471/+merge/159239 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/bug1132937 into lp:zorba
Review: Needs Fixing - include/zorba/item_factory.h - createDateTimeStamp is not correctly indented and should go to the end of the file - the type of the timezone argument should be a long and the value indicate seconds (see also bug #1103115) - Why do you remove the catch clause in src/store/naive/simple_pul.cpp? -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug-867376 into lp:zorba
Review: Needs Fixing - Why is there a schema imported in uri.xq? I don't think it's needed anymore. - The documentation should say what types of errors the function can raise. - It would be nice to have constants for the names of the fields in the objects (e.g. scheme, opaque-part) - Why does the change comment out all language bindings in swig/CMakeLists.txt and test/rbkt/modules/CMakeLists.txt? -- https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233 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/bug1132937 into lp:zorba
- include/zorba/item_factory.h - createDateTimeStamp is not correctly indented and should go to the end of the file DONE - the type of the timezone argument should be a long and the value indicate seconds (see also bug #1103115) This is a big change, it involves the way the TimeZone is managed internally, this is not the scope of this bug, this will require much more time and I think the changes for this bug need to be released. The changes on DateTimeStamp where merged from bug #924756, so, perhaps this new behavior can be required on bug #1103115 or on a new bug. - Why do you remove the catch clause in src/store/naive/simple_pul.cpp? Because the next clause does exactly the same. -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
about [src/store/naive/simple_pul.cpp] was just a windows warning removal. -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
> - the type of the timezone argument should be a long and the value indicate > seconds (see also bug #1103115) > This is a big change, it involves the way the TimeZone is managed internally, > this is not the scope of this bug, this will require much more time and I > think the changes for this bug need to be released. > The changes on DateTimeStamp where merged from bug #924756, so, perhaps this > new behavior can be required on bug #1103115 or on a new bug. I leave the decision to Chris whether we want to extend the already broken API or do it once the bug is fixed. > > - Why do you remove the catch clause in src/store/naive/simple_pul.cpp? > Because the next clause does exactly the same. OK. I hope Markos doesn't use this clause regularly. -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1132937 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1132937-2013-04-17T00-13-20.738Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1132937 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 bug1132937-2013-04-17T00-13-20.738Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1132937 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1132937 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1132937-2013-04-17T00-27-35.962Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1132937 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 bug1132937-2013-04-17T00-27-35.962Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1132937 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 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/new-jsoniq into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/compiler/parser/jsoniq_parser.cpp text conflict in src/compiler/parser/jsoniq_parser.hpp text conflict in src/compiler/parser/jsoniq_scanner.cpp text conflict in src/compiler/parser/xquery_parser.cpp text conflict in src/compiler/parser/xquery_parser.hpp text conflict in src/compiler/parser/xquery_scanner.cpp -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 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/bug1132937 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1132937 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1132937-2013-04-17T01-00-27.847Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug-867376 into lp:zorba
Also, currently serialize-direct-uri.xq fails because the expected output file serialize-direct-uri.xml.res is missing a couple results, namely the opaque URI tests at the end. Did you forget to commit that file? -- https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233 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/bug-867376 into lp:zorba
Review: Needs Fixing I think actually there are some error conditions that we're not catching currently. For instance, the following input in serialize-direct-uri.xq: { "scheme" : "file", "path" : "d:/a/b/c" } is a non-opaque URI because it has a path, rather than an opaque-part. But it produces the output: file:d:/a/b/c which is an opaque URI. I believe that the input is illegal, because a non-opaque URI with a scheme MUST have a path section that begins with a / character. So the above input should actually raise an error. -- https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 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/bug1132937 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1132937 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 bug1132937-2013-04-17T01-00-27.847Z is finished. The final status was: 3 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/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1132937 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/new-jsoniq into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba failed. Below is the output from the failed tests. Traceback (most recent call last): File "/home/ceej/zo/testing/zorbatest/tester/proposal_comment.py", line 36, in sys.exit(main(sys.argv)) File "/home/ceej/zo/testing/zorbatest/tester/proposal_comment.py", line 34, in main proposal.lp_save() File "/home/ceej/python/lib/python2.7/site-packages/lazr/restfulclient/resource.py", line 744, in lp_save URI(self.self_link), representation, headers) File "/home/ceej/python/lib/python2.7/site-packages/lazr/restfulclient/_browser.py", line 456, in patch 'PATCH', extra_headers=extra_headers) File "/home/ceej/python/lib/python2.7/site-packages/lazr/restfulclient/_browser.py", line 401, in _request raise error lazr.restfulclient.errors.PreconditionFailed: HTTP Error 412: Precondition Failed Response headers: --- -content-encoding: gzip content-length: 0 content-type: text/plain date: Wed, 17 Apr 2013 01:23:53 GMT server: zope.server.http (HTTP) status: 412 strict-transport-security: max-age=2592000 vary: Accept,Accept-Encoding via: 1.1 api.launchpad.net x-content-type-options: nosniff x-content-type-warning: guessed from content x-frame-options: SAMEORIGIN x-lazr-notifications: [] x-powered-by: Zope (www.zope.org), Python (www.python.org) x-xss-protection: 1; mode=block --- Response body: --- --- CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job new-jsoniq-2013-04-17T01-23-48.66Z is finished. The final status was: Undetermined, probably an error - please email chill...@lambda.nu with the number of this job! Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Commit Message changed to: Merging of xquery and jsoniq grammar files step 1 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 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/new-jsoniq into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-17T01-23-48.66Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 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/new-jsoniq into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-17T01-24-44.705Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 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/new-jsoniq into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/new-jsoniq 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 new-jsoniq-2013-04-17T01-24-44.705Z is finished. The final status was: 70 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/new-jsoniq/+merge/159274 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159274 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba. Commit message: Added hash_c_str() and hash. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159290 Added hash_c_str() and hash. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159290 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/util/hash/hash.cpp' --- src/util/hash/hash.cpp 2013-02-07 17:24:36 + +++ src/util/hash/hash.cpp 2013-04-17 04:58:28 + @@ -31,15 +31,15 @@ /// size_t hash_bytes( void const *p, size_t len, size_t result ) { - unsigned char const *c = reinterpret_cast( p ); - unsigned char const *const end = c + len; + unsigned char const *u = reinterpret_cast( p ); + unsigned char const *const end = u + len; #ifdef ZORBA_HASH_FN_FNV_1a // // FNV-1a (Fowler/Noll/Vo) hashing algorithm. // - while ( c < end ) { + while ( u < end ) { result *= Hash_Prime; -result ^= *c++; +result ^= *u++; } #endif /* ZORBA_HASH_FN_FNV_1a */ #ifdef ZORBA_HASH_FN_PJW @@ -61,8 +61,32 @@ static size_t const OneEighth = BitsInSizeT / 8; static size_t const HighBits = ~( (size_t)(~0ul) >> OneEighth ); - while ( c < end ) { -result = (result << OneEighth) + *c++; + while ( u < end ) { +result = (result << OneEighth) + *u++; +if ( size_t temp = result & HighBits ) + result = (result ^ (temp >> ThreeFourths)) & ~HighBits; + } +#endif /* ZORBA_HASH_FN_PJW */ + return result; +} + +size_t hash_c_str( char const *s, size_t result ) { + unsigned char const *u = reinterpret_cast( s ); +#ifdef ZORBA_HASH_FN_FNV_1a + while ( *u ) { +result *= Hash_Prime; +result ^= *u++; + } +#endif /* ZORBA_HASH_FN_FNV_1a */ +#ifdef ZORBA_HASH_FN_PJW + static size_t const BitsInSizeT = sizeof( size_t ) * + numeric_limits::digits; + static size_t const ThreeFourths = BitsInSizeT * 3 / 4; + static size_t const OneEighth = BitsInSizeT / 8; + static size_t const HighBits = ~( (size_t)(~0ul) >> OneEighth ); + + while ( *u ) { +result = (result << OneEighth) + *u++; if ( size_t temp = result & HighBits ) result = (result ^ (temp >> ThreeFourths)) & ~HighBits; } === modified file 'src/util/hash/hash.h' --- src/util/hash/hash.h 2013-02-07 17:24:36 + +++ src/util/hash/hash.h 2013-04-17 04:58:28 + @@ -79,6 +79,31 @@ return hash_bytes( &v, sizeof( v ) ); } +/** + * Generic hash function that hashes a null-terminated C string. + * + * @param s A pointer to the C string to hash. + * @param init The initialization value. + * @return Returns the hash code for the given C string. + */ +size_t hash_c_str( char const *s, size_t init = Hash_Init ); + +/** + * The generic %hash unary_function class. + * + * @tparam T The type to hash. + */ +template +struct hash : std::unary_function { + size_t operator()( T ) const; // not defined +}; + +/** Specialization for \c char*. */ +template<> inline +size_t hash::operator()( char const *s ) const { + return hash_c_str( s ); +} + } // namespace ztd } // namespace 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159290 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/bug1132937 into lp:zorba
FYI, the ruby test at least failed because it tried to open this file: /home/ceej/zo/testing/zorbatest/tester/remotequeue/bug1132937-2013-04-17T01-00-27.847Z/bzr/zorba/build/swig/ruby/../tests/satellites.json but that file doesn't exist. However, if you remove the "../" from the path, it exists. So the path is being computed incorrectly somewhere. -- https://code.launchpad.net/~zorba-coders/zorba/bug1132937/+merge/155640 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/bug1132937 into lp:zorba
php_test10 failed because the .php file uses a <