[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/160535 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/160535 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-24T02-30-54.19Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/160535 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-24T02-30-54.19Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/160535 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/160535 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/160535 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/160535 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: No copying of global variables in function item Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/160535 No copying of global variables in function item -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/160535 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/159569 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159569 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-18T09-36-45.796Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159569 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-18T09-36-45.796Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159569 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/159569 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159569 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/159569 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:
1. Fixed bug concerning the raising of XPTY0018 in the presence of function
items.
2. hof optimization: avoid function coersion if possible.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159569
1. Fixed bug concerning the raising of XPTY0018 in the presence of function
items.
2. hof optimization: avoid function coersion if possible.
--
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/159569
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-04-16 20:06:08 +
+++ src/compiler/translator/translator.cpp 2013-04-18 08:52:28 +
@@ -1506,16 +1506,21 @@
}
else if (paramType->type_kind() == XQType::FUNCTION_TYPE_KIND)
{
- // function coercion
- argExpr = wrap_in_coercion(paramType, argExpr, loc);
-
- xqtref_t cardType = tm->create_any_item_type(paramType->get_quantifier());
-
- argExpr = wrap_in_type_match(argExpr,
- cardType,
- loc,
- TREAT_FUNC_PARAM,
- func->getName());
+ xqtref_t argType = argExpr->get_return_type();
+
+ if (!TypeOps::is_subtype(tm, *argType, *paramType, loc))
+ {
+// function coercion
+argExpr = wrap_in_coercion(paramType, argExpr, loc);
+
+xqtref_t cardType = tm->create_any_item_type(paramType->get_quantifier());
+
+argExpr = wrap_in_type_match(argExpr,
+ cardType,
+ loc,
+ TREAT_FUNC_PARAM,
+ func->getName());
+ }
}
else
{
=== modified file 'src/runtime/core/sequencetypes.cpp'
--- src/runtime/core/sequencetypes.cpp 2013-04-08 19:44:58 +
+++ src/runtime/core/sequencetypes.cpp 2013-04-18 08:52:28 +
@@ -813,16 +813,16 @@
if (CONSUME(result, 0))
{
-state->atomics = result->isAtomic();
+state->atomics = !result->isNode();
STACK_PUSH(true, state);
while (CONSUME(result, 0))
{
- if (state->atomics != result->isAtomic())
+ if (state->atomics == result->isNode())
throw XQUERY_EXCEPTION(err::XPTY0018, ERROR_LOC(loc));
- STACK_PUSH (true, state);
+ STACK_PUSH(true, state);
}
}
=== modified file 'src/store/naive/node_iterators.cpp'
--- src/store/naive/node_iterators.cpp 2013-02-07 17:24:36 +
+++ src/store/naive/node_iterators.cpp 2013-04-18 08:52:28 +
@@ -207,7 +207,7 @@
if (!theInput->next(result))
return false;
-if (!result->isAtomic())
+if (result->isNode())
throw XQUERY_EXCEPTION(err::XPTY0018);
return true;
@@ -216,7 +216,7 @@
if (!theInput->next(result))
return false;
- if (result->isAtomic())
+ if (!result->isNode())
{
if (theNodeMode)
throw XQUERY_EXCEPTION(err::XPTY0018);
@@ -236,7 +236,7 @@
if (!theInput->next(result))
return false;
- if (result->isAtomic())
+ if (!result->isNode())
throw XQUERY_EXCEPTION(err::XPTY0018);
}
}
@@ -404,7 +404,7 @@
if (!theInput->next(result))
return false;
-if (!result->isAtomic())
+if (result->isNode())
throw XQUERY_EXCEPTION(err::XPTY0018);
return true;
@@ -417,7 +417,7 @@
if (!theInput->next(result))
break;
- if (result->isAtomic() || result->isFunction())
+ if (!result->isNode())
{
if (theNodeMode)
throw XQUERY_EXCEPTION(err::XPTY0018);
--
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
[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
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/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
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
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: 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
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
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
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:~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/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
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,
[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:~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 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: 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
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
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
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
[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-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: 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
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
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
[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
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. 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. 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
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-15T21-24-58.908Z is finished. The final status was: 4 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
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T21-24-58.908Z/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
[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
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-15T14-23-55.986Z is finished. The final status was: 919 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
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T14-23-55.986Z/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
[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
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-15T13-40-26.669Z 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/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-15T13-40-26.669Z/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
[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: Fixed problem with function items associated with contextual builtin functions Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 Fixed problem with function items associated with contextual builtin functions -- 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/155722 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722 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-03-27T15-58-53.589Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722 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-03-27T15-58-53.589Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722 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/155722 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722 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/155722 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722 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-03-27T12-45-54.501Z is finished. The final status was: 2 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/155722 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-03-27T12-45-54.501Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722 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/155722 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722 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/155722 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:
fixed function coersion
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722
fixed function coersion
--
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155722
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-27 09:32:22 +
+++ src/compiler/translator/translator.cpp 2013-03-27 12:42:22 +
@@ -1517,14 +1517,21 @@
PROMOTE_FUNC_PARAM,
func->getName());
}
+else if (paramType->type_kind() == XQType::FUNCTION_TYPE_KIND)
+{
+ // function coercion
+ argExpr = wrap_in_coercion(paramType, argExpr, loc);
+
+ xqtref_t cardType = tm->create_any_item_type(paramType->get_quantifier());
+
+ argExpr = wrap_in_type_match(argExpr,
+ cardType,
+ loc,
+ TREAT_FUNC_PARAM,
+ func->getName());
+}
else
{
- if (paramType->type_kind() == XQType::FUNCTION_TYPE_KIND)
- {
-// function coercion
-argExpr = wrap_in_coercion(paramType, argExpr, loc, theCCB);
- }
-
argExpr = wrap_in_type_match(argExpr,
paramType,
loc,
@@ -1538,83 +1545,94 @@
/***
+ The coersion expr is a flwor that looks like this:
+
+ for $fi in argExpr
+ return function($p1 as t1, ... $pn as tn) { $fi(p1, ..., pn) }
/
expr* wrap_in_coercion(
xqtref_t targetType,
-expr* theExpr,
-const QueryLoc& loc,
-CompilerCB* theCCB,
-bool is_func_return = false)
+expr* argExpr,
+const QueryLoc& loc)
{
- const FunctionXQType* func_type = static_cast(targetType.getp());
-
- // Create the dynamic call body
-
- function_item_expr* fiExpr =
+ const FunctionXQType* funcType =
+ static_cast(targetType.getp());
+
+ xqtref_t returnType = funcType->get_return_type();
+
+ push_scope();
+
+ flwor_expr* coersionFlwor = CREATE(flwor)(theRootSctx, theUDF, loc, false);
+ for_clause* fiClause = wrap_in_forclause(argExpr, NULL);
+ var_expr* fiVar = fiClause->get_var();
+ coersionFlwor->add_clause(fiClause);
+
+ function_item_expr* inlineFuncExpr =
CREATE(function_item)(theRootSctx, theUDF, loc, true, false, true);
- push_nodestack(fiExpr);
-
- push_scope();
-
- // handle the function item expression
- flwor_expr* fnItem_flwor = CREATE(flwor)(theRootSctx, theUDF, loc, false);
- for_clause* fnItem_fc = wrap_in_forclause(theExpr, NULL);
- var_expr* fnItem_var = fnItem_fc->get_var();
- fnItem_flwor->add_clause(fnItem_fc);
- var_expr* inner_subst_var = bind_var(loc, fnItem_var->get_name(), var_expr::hof_var);
- fiExpr->add_variable(fnItem_var, inner_subst_var, fnItem_var->get_name(), 0 /*var is not global*/);
-
- // bind the function item variable in the inner flwor
- flwor_expr* inner_flwor = CREATE(flwor)(theRootSctx, theUDF, loc, false);
-
- // Handle parameters. For each parameter, a let binding is added to the inner flwor.
+ coersionFlwor->set_return_expr(inlineFuncExpr);
+
+ var_expr* fiSubstVar = bind_var(loc, fiVar->get_name(), var_expr::hof_var);
+
+ inlineFuncExpr->add_variable(fiVar, fiSubstVar, fiVar->get_name(), 0);
+
+ // Create the inline udf obj.
+ user_function_t inlineUDF =
+ new user_function(loc,
+signature(function_item_expr::create_inline_fname(loc),
+ funcType->get_param_types(),
+ returnType),
+NULL,
+SIMPLE_EXPR,
+theCCB);
+
+ inlineFuncExpr->set_function(inlineUDF);
+
+ std::vector argVars;
std::vector arguments;// Arguments to the dynamic function call
- for(csize i = 0; i < func_type->get_number_params(); i++)
- {
-xqtref_t paramType = func_type->operator[](i);
-
-var_expr* arg_var = create_temp_var(loc, var_expr::arg_var);
-var_expr* subst_var = bind_var(loc, arg_var->get_name(), var_expr::let_var);
-let_clause* lc = wrap_in_letclause(&*arg_var, subst_var);
-
-arg_var->set_param_pos(inner_flwor->num_clauses());
-arg_var->set_type(paramType);
-
-inner_flwor->add_clause(lc);
-
-arguments.push_back(CREATE(wrapper)(theRootSctx, theUDF, loc, subst_var));
- }
-
- if (inner_flwor->num_clauses() == 0)
- {
-inner_flwor = NULL;
+ csize numParams = funcType->get_number_params();
+ for(csize i = 0; i < numParams; ++i)
+ {
+xqtref_t paramType = funcType->operator[](i)
[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/155684 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155684 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-03-27T09-35-56.894Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155684 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-03-27T09-35-56.894Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155684 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/155684 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155684 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/155684 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:
some more hof cleanup
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155684
some more hof cleanup
--
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155684
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-03-27 07:55:14 +
+++ src/compiler/codegen/plan_visitor.cpp 2013-03-27 09:33:25 +
@@ -472,9 +472,6 @@
fnInfo->theCCB = theCCB;
fnInfo->theMustDeleteCCB = false;
fnInfo->theLoc = qloc;
- fnInfo->theFunction = v.get_function();
- fnInfo->theQName = v.get_qname();
- fnInfo->theArity = v.get_arity();
if (v.is_inline())
{
@@ -484,7 +481,8 @@
fnInfo->theScopedVarsIterators.push_back(pop_itstack());
}
-std::reverse(fnInfo->theScopedVarsIterators.begin(), fnInfo->theScopedVarsIterators.end());
+std::reverse(fnInfo->theScopedVarsIterators.begin(),
+ fnInfo->theScopedVarsIterators.end());
}
@@ -494,30 +492,22 @@
csize numOuterVars = fnInfo->theScopedVarsNames.size();
for (csize i = 0; i < numOuterVars; ++i)
{
- var_expr* ve = theCCB->theEM->create_var_expr(fnInfo->theClosureSctx,
-NULL,
-qloc,
-var_expr::hof_var,
-fnInfo->theScopedVarsNames[i].getp());
-
if (!fnInfo->theIsGlobalVar[i])
{
++curChild;
-if (fnInfo->theSubstVarsValues[i] != NULL
-&&
+if (fnInfo->theSubstVarsValues[i] != NULL &&
fnInfo->theSubstVarsValues[i]->get_unique_id() == 0)
{
fnInfo->theSubstVarsValues[i]->set_var_info(NULL);
fnInfo->theSubstVarsValues[i]->set_unique_id(theNextDynamicVarId++);
}
-ve->set_unique_id(fnInfo->theSubstVarsValues[i]->get_unique_id());
fnInfo->theVarId[i] = fnInfo->theSubstVarsValues[i]->get_unique_id();
}
else
{
-static_context* outerSctx = fnInfo->theClosureSctx->get_parent();
+static_context* outerSctx = fnInfo->theClosureSctx;
VarInfo* outerGlobalVar = outerSctx->lookup_var(fnInfo->theScopedVarsNames[i]);
@@ -536,15 +526,12 @@
}
}
-if (fnInfo->theSubstVarsValues[i] != NULL
-&&
+if (fnInfo->theSubstVarsValues[i] != NULL &&
fnInfo->theSubstVarsValues[i]->get_unique_id() == 0)
{
fnInfo->theSubstVarsValues[i]->set_unique_id(outerGlobalVarId);
}
-ve->set_unique_id(outerGlobalVarId);
-
fnInfo->theVarId[i] = outerGlobalVarId;
}
} // for
=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp 2013-03-26 21:26:20 +
+++ src/compiler/expression/expr_clone.cpp 2013-03-27 09:33:25 +
@@ -387,7 +387,6 @@
udf,
get_loc(),
e->theFunctionItemInfo->theFunction,
- e->theFunctionItemInfo->theFunction->getName(),
e->theFunctionItemInfo->theArity,
e->is_inline(),
e->needs_context_item(),
=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp 2013-03-23 15:20:54 +
+++ src/compiler/expression/expr_manager.cpp 2013-03-27 09:33:25 +
@@ -813,14 +813,13 @@
user_function* udf,
const QueryLoc& loc,
function* f,
-store::Item* qname,
uint32_t arity,
bool isInline,
bool needsContextItem,
bool isCoercion)
{
CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc,
- f, qname, arity, isInline, needsContextItem, isCoercion);
+ f, arity, isInline, needsContextItem, isCoercion);
}
=== modified file 'src/compiler/expression/expr_manager.h'
--- src/compiler/expression/expr_manager.h 2013-03-23 15:20:54 +
+++ src/compiler/expression/expr_manager.h 2013-03-27 09:33:25 +
@@ -493,7 +493,6 @@
user_function* udf,
const QueryLoc& loc,
function* f,
- store::Item* qname,
uint32_t arity,
bool isInline,
bool needsContextItem,
=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp 2013-03-16 08:48:16 +
+++ src/compiler/expression/expr_type.cpp 2013-03-27 09:33:25 +
@@ -653,12 +653,15 @@
case function_item_expr_kind:
{
theType = rtm.ANY_FUNCTION_TYPE_ONE;
+
function_item_expr* fiExp
[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/155677 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155677 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-03-27T08-15-48.312Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155677 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-03-27T08-15-48.312Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155677 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/155677 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155677 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/155677 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:
moved FunctionItemIterator code to new function_item_iter.h/cpp files
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155677
moved FunctionItemIterator code to new function_item_iter.h/cpp files
--
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155677
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-03-27 00:44:34 +
+++ src/compiler/codegen/plan_visitor.cpp 2013-03-27 07:59:30 +
@@ -93,6 +93,7 @@
#endif
#include "runtime/eval/eval.h"
#include "runtime/hof/function_item.h"
+#include "runtime/hof/function_item_iter.h"
#include "runtime/hof/fn_hof_functions.h"
#include "runtime/hof/dynamic_fncall_iterator.h"
#include "runtime/misc/materialize.h"
=== modified file 'src/runtime/CMakeLists.txt'
--- src/runtime/CMakeLists.txt 2013-03-26 23:32:03 +
+++ src/runtime/CMakeLists.txt 2013-03-27 07:59:30 +
@@ -141,6 +141,7 @@
util/flowctl_exception.cpp
util/doc_uri_heuristics.cpp
hof/function_item.cpp
+ hof/function_item_iter.cpp
hof/dynamic_fncall_iterator.cpp
eval/eval.cpp
collections/collections_base.cpp
=== modified file 'src/runtime/hof/function_item.cpp'
--- src/runtime/hof/function_item.cpp 2013-03-26 23:32:03 +
+++ src/runtime/hof/function_item.cpp 2013-03-27 07:59:30 +
@@ -47,8 +47,6 @@
SERIALIZABLE_CLASS_VERSIONS(FunctionItem)
-SERIALIZABLE_CLASS_VERSIONS(FunctionItemIterator)
-
/***
@@ -283,228 +281,5 @@
}
-
-/***
-
-/
-FunctionItemIterator::FunctionItemIterator(
- static_context* sctx,
- const QueryLoc& loc,
- FunctionItemInfo* fnInfo)
- :
- NaryBaseIterator(sctx, loc, fnInfo->theScopedVarsIterators),
- theFunctionItemInfo(fnInfo)
-{
-}
-
-
-FunctionItemIterator::~FunctionItemIterator()
-{
-}
-
-
-void FunctionItemIterator::serialize(::zorba::serialization::Archiver& ar)
-{
- serialize_baseclass(ar,
- (NaryBaseIterator*)this);
- ar & theFunctionItemInfo;
-}
-
-
-bool FunctionItemIterator::nextImpl(store::Item_t& result, PlanState& planState) const
-{
- PlanIteratorState* state;
- DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
-
- // This portion is taken from the eval iterator
- {
-// Create the dynamic context for the eval query
-std::auto_ptr evalDctx;
-evalDctx.reset(new dynamic_context(planState.theGlobalDynCtx));
-
-// Import the outer environment.
-importOuterEnv(planState,
- theFunctionItemInfo->theCCB,
- theFunctionItemInfo->theClosureSctx,
- evalDctx.get());
-
-if (theFunctionItemInfo->theIsCoercion)
-{
- FunctionItemIterator* child = dynamic_cast(theChildren[0].getp());
- if (child != NULL)
-theFunctionItemInfo->theQName = child->theFunctionItemInfo->theQName;
-}
-
-result = new FunctionItem(theFunctionItemInfo, evalDctx.release());
- }
-
- STACK_PUSH ( result != NULL, state );
- STACK_END (state);
-}
-
-
-/
-
- These functions are copied from the EvalIterator -- maybe they could be shared.
-
-/
-
-///**
- This method imports a static and dynamic environment from the quter query into
- the eval query. In particular:
-
- (a) imports into the importSctx all the outer vars of the eval query
- (b) imports into the importSctx all the ns bindings of the outer query at the
- place where the eval call appears at
- (c) Copies all the var values from the outer-query global dctx into the eval-
- query dctx.
- (d) For each of the non-global outer vars, places its value into the eval dctx.
- The var value is represented as a PlanIteratorWrapper over the subplan that
- evaluates the domain expr of the eval var.
- (e) Computes the max var id of all the var values set in steps (c) and (d).
- This max varid will be passed to the compiler of the eval query so that
- the varids that will be generated for the eval query will not conflict with
- the varids of the outer vars and the outer-query global vars.
-/
-void FunctionItemIterator::importOuterEnv(
-PlanState& planState,
-CompilerCB* evalCCB,
-static_context* importSctx,
-dynamic_context* evalDctx) const
-{
- ulong maxOuterVarId = 1;
-
[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/155642 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155642 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-03-27T01-06-21.343Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155642 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-03-27T01-06-21.343Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155642 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/155642 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155642 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/155642 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/155638 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155638 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-03-27T00-05-53.294Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155638 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-03-27T00-05-53.294Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155638 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/155638 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155638 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/155638 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/155635 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635 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-03-26T22-58-54.838Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635 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-03-26T22-58-54.838Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635 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/155635 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635 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/155635 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:
renamed DynamicFunctionIterator to FunctionItemIterator
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635
renamed DynamicFunctionIterator to FunctionItemIterator
--
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635
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-03-26 21:26:20 +
+++ src/compiler/codegen/plan_visitor.cpp 2013-03-26 22:32:25 +
@@ -549,7 +549,7 @@
} // for
}
- push_itstack(new DynamicFunctionIterator(sctx, qloc, fnInfo));
+ push_itstack(new FunctionItemIterator(sctx, qloc, fnInfo));
}
=== modified file 'src/runtime/function_item/function_item.cpp'
--- src/runtime/function_item/function_item.cpp 2013-03-26 21:26:20 +
+++ src/runtime/function_item/function_item.cpp 2013-03-26 22:32:25 +
@@ -47,7 +47,7 @@
SERIALIZABLE_CLASS_VERSIONS(FunctionItem)
-SERIALIZABLE_CLASS_VERSIONS(DynamicFunctionIterator)
+SERIALIZABLE_CLASS_VERSIONS(FunctionItemIterator)
/***
@@ -287,31 +287,31 @@
/***
/
-DynamicFunctionIterator::DynamicFunctionIterator(
+FunctionItemIterator::FunctionItemIterator(
static_context* sctx,
const QueryLoc& loc,
FunctionItemInfo* fnInfo)
:
- NaryBaseIterator(sctx, loc, fnInfo->theScopedVarsIterators),
+ NaryBaseIterator(sctx, loc, fnInfo->theScopedVarsIterators),
theFunctionItemInfo(fnInfo)
{
}
-DynamicFunctionIterator::~DynamicFunctionIterator()
+FunctionItemIterator::~FunctionItemIterator()
{
}
-void DynamicFunctionIterator::serialize(::zorba::serialization::Archiver& ar)
+void FunctionItemIterator::serialize(::zorba::serialization::Archiver& ar)
{
serialize_baseclass(ar,
- (NaryBaseIterator*)this);
+ (NaryBaseIterator*)this);
ar & theFunctionItemInfo;
}
-bool DynamicFunctionIterator::nextImpl(store::Item_t& result, PlanState& planState) const
+bool FunctionItemIterator::nextImpl(store::Item_t& result, PlanState& planState) const
{
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
@@ -330,7 +330,7 @@
if (theFunctionItemInfo->theIsCoercion)
{
- DynamicFunctionIterator* child = dynamic_cast(theChildren[0].getp());
+ FunctionItemIterator* child = dynamic_cast(theChildren[0].getp());
if (child != NULL)
theFunctionItemInfo->theQName = child->theFunctionItemInfo->theQName;
}
@@ -366,7 +366,7 @@
the varids that will be generated for the eval query will not conflict with
the varids of the outer vars and the outer-query global vars.
/
-void DynamicFunctionIterator::importOuterEnv(
+void FunctionItemIterator::importOuterEnv(
PlanState& planState,
CompilerCB* evalCCB,
static_context* importSctx,
@@ -453,7 +453,7 @@
///**
/
-void DynamicFunctionIterator::setExternalVariables(
+void FunctionItemIterator::setExternalVariables(
CompilerCB* ccb,
static_context* importSctx,
dynamic_context* evalDctx) const
@@ -503,7 +503,7 @@
}
}
-NARY_ACCEPT(DynamicFunctionIterator)
+NARY_ACCEPT(FunctionItemIterator)
} //namespace zorba
=== modified file 'src/runtime/function_item/function_item.h'
--- src/runtime/function_item/function_item.h 2013-03-26 21:26:20 +
+++ src/runtime/function_item/function_item.h 2013-03-26 22:32:25 +
@@ -36,7 +36,7 @@
/***
A class to hold information about a dynamic function. This info is shared
- between the DynamicFunctionIterator and the FunctionItems it creates.
+ between the FunctionItemIterator and the FunctionItems it creates.
theCCB :
@@ -237,24 +237,24 @@
/***
An iterator that creates and returns dynamic function items
/
-class DynamicFunctionIterator : public NaryBaseIterator
+class FunctionItemIterator : public NaryBaseIterator
{
protected:
FunctionItemInfo_t theFunctionItemInfo;
public:
- SERIALIZABLE_CLASS(DynamicFunctionIterator)
- SERIALIZABLE_CLASS_CONSTRUCTOR2T(DynamicFunctionIterator,
- NaryBaseIterator)
+ SERIALIZABLE_CLASS(FunctionItemIterator)
+ SERIALIZ
[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/155621 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155621 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-03-26T21-55-43.651Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155621 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-03-26T21-55-43.651Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155621 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/155621 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155621 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/155621 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:
renamed DynamicFunctionInfo to FunctionItemInfo
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155621
renamed DynamicFunctionInfo to FunctionItemInfo
--
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155621
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-03-17 13:55:28 +
+++ src/compiler/codegen/plan_visitor.cpp 2013-03-26 21:30:30 +
@@ -467,7 +467,7 @@
{
CODEGEN_TRACE_OUT("");
- DynamicFunctionInfo* fnInfo = v.get_dynamic_fn_info();
+ FunctionItemInfo* fnInfo = v.get_dynamic_fn_info();
fnInfo->theCCB = theCCB;
fnInfo->theMustDeleteCCB = false;
fnInfo->theLoc = qloc;
=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp 2013-03-23 15:23:57 +
+++ src/compiler/expression/expr_clone.cpp 2013-03-26 21:30:30 +
@@ -386,26 +386,26 @@
create_function_item_expr(theSctx,
udf,
get_loc(),
- e->theDynamicFunctionInfo->theFunction,
- e->theDynamicFunctionInfo->theFunction->getName(),
- e->theDynamicFunctionInfo->theArity,
+ e->theFunctionItemInfo->theFunction,
+ e->theFunctionItemInfo->theFunction->getName(),
+ e->theFunctionItemInfo->theArity,
e->is_inline(),
e->needs_context_item(),
e->is_coercion());
std::vector::const_iterator varIter =
-e->theDynamicFunctionInfo->theScopedVarsValues.begin();
+e->theFunctionItemInfo->theScopedVarsValues.begin();
std::vector::const_iterator substVarIter =
-e->theDynamicFunctionInfo->theSubstVarsValues.begin();
+e->theFunctionItemInfo->theSubstVarsValues.begin();
std::vector::const_iterator nameIter =
-e->theDynamicFunctionInfo->theScopedVarsNames.begin();
+e->theFunctionItemInfo->theScopedVarsNames.begin();
std::vector::const_iterator isGlobalIter =
-e->theDynamicFunctionInfo->theIsGlobalVar.begin();
+e->theFunctionItemInfo->theIsGlobalVar.begin();
-for (; varIter != e->theDynamicFunctionInfo->theScopedVarsValues.end();
+for (; varIter != e->theFunctionItemInfo->theScopedVarsValues.end();
++varIter, ++substVarIter, ++nameIter, ++isGlobalIter)
{
cloneExpr->add_variable((*varIter) ? (*varIter)->clone(udf, subst) : NULL,
=== modified file 'src/compiler/expression/expr_iter.cpp'
--- src/compiler/expression/expr_iter.cpp 2013-03-16 08:48:16 +
+++ src/compiler/expression/expr_iter.cpp 2013-03-26 21:30:30 +
@@ -704,8 +704,8 @@
EXPR_ITER_BEGIN();
-theArgsIter = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.begin();
-theArgsEnd = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.end();
+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
=== modified file 'src/compiler/expression/expr_put.cpp'
--- src/compiler/expression/expr_put.cpp 2013-03-17 13:55:28 +
+++ src/compiler/expression/expr_put.cpp 2013-03-26 21:30:30 +
@@ -537,30 +537,30 @@
if (!is_inline())
{
-os << " " << theDynamicFunctionInfo->theQName->getStringValue()
- << "#" << theDynamicFunctionInfo->theArity;
+os << " " << theFunctionItemInfo->theQName->getStringValue()
+ << "#" << theFunctionItemInfo->theArity;
os << dec_indent << endl;
return os;
}
else
{
-os << " " << theDynamicFunctionInfo->theQName->getStringValue()
- << "#" << theDynamicFunctionInfo->theArity << " [\n";
+os << " " << theFunctionItemInfo->theQName->getStringValue()
+ << "#" << theFunctionItemInfo->theArity << " [\n";
-for (ulong i = 0; i < theDynamicFunctionInfo->theScopedVarsValues.size(); i++)
+for (ulong i = 0; i < theFunctionItemInfo->theScopedVarsValues.size(); i++)
{
os << indent << "using $"
- << theDynamicFunctionInfo->theScopedVarsNames[i]->getStringValue()
- << (theDynamicFunctionInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
+ << theFunctionItemInfo->theScopedVarsNames[i]->getStringValue()
+ << (theFunctionItemInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
os << endl << inc_indent;
-
