[Zorba-coders] [Merge] lp:~zorba-coders/zorba/hof-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-25T15-29-55.717Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-25T15-29-55.717Z 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-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-25T15-58-53.846Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-25T15-58-53.846Z 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-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-25T16-42-52.153Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-25T21-55-53.836Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-25T21-55-53.836Z is finished. The final status was: 42 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-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/hof-merge into
lp:zorba.
Commit message:
Some runtime code restructuring:
1. moved runtime/function_item/ to runtime/hof
2. renamed function_item_iter files to fn_hof_functions files
3. split function_item.h to function_item.h and function_item_iter.h (and same
for the .cpp file)
4. Renamed DynamicFunctioniterator to FunctionItemIterator
5. Renamed DynamicFunctionInfo to FunctionItemInfo
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144
Some runtime code restructuring:
1. moved runtime/function_item/ to runtime/hof
2. renamed function_item_iter files to fn_hof_functions files
3. split function_item.h to function_item.h and function_item_iter.h (and same
for the .cpp file)
4. Renamed DynamicFunctioniterator to FunctionItemIterator
5. Renamed DynamicFunctionInfo to FunctionItemInfo
--
https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144
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-24 15:29:24 +
@@ -483,7 +483,8 @@
fnInfo-theScopedVarsIterators.push_back(pop_itstack());
}
-std::reverse(fnInfo-theScopedVarsIterators.begin(), fnInfo-theScopedVarsIterators.end());
+std::reverse(fnInfo-theScopedVarsIterators.begin(),
+ fnInfo-theScopedVarsIterators.end());
}
@@ -494,10 +495,10 @@
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());
+NULL,
+qloc,
+var_expr::hof_var,
+fnInfo-theScopedVarsNames[i].getp());
if (!fnInfo-theIsGlobalVar[i])
{
=== 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-24 15:29:24 +
@@ -387,7 +387,6 @@
udf,
get_loc(),
e-theDynamicFunctionInfo-theFunction,
- e-theDynamicFunctionInfo-theFunction-getName(),
e-theDynamicFunctionInfo-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-24 15:29:24 +
@@ -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-24 15:29:24 +
@@ -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-24 15:29:24 +
@@ -653,12 +653,15 @@
case function_item_expr_kind:
{
theType = rtm.ANY_FUNCTION_TYPE_ONE;
+
function_item_expr* fiExpr = static_castfunction_item_expr*(this);
+
if (fiExpr-get_function() != NULL)
{
const xqtref_t retType = fiExpr-get_function()-getSignature().returnType();
+
std::vectorxqtref_t paramTypes;
- for (csize i=0; ifiExpr-get_function()-getSignature().paramCount(); i++ )
+ for (csize i = 0; i fiExpr-get_function()-getSignature().paramCount(); ++i)
paramTypes.push_back(fiExpr-get_function()-getSignature()[i]);
theType = new FunctionXQType(rtm, paramTypes, retType, TypeConstants::QUANT_ONE);
=== modified file 'src/compiler/expression/function_item_expr.cpp'
--- src/compiler
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/hof-merge into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-24T18-10-49.338Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-24T18-10-49.338Z 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-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: deleting parent in src/runtime/function_item unversioned parent in src/runtime/function_item contents conflict in src/runtime/function_item/dynamic_fncall_iterator.cpp contents conflict in src/runtime/function_item/dynamic_fncall_iterator.h -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144 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-merge into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/hof-merge into
lp:zorba.
Commit message:
cleanup + fixed 2 hof tests concerning the fn:fold-right function
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155100
cleanup + fixed 2 hof tests concerning the fn:fold-right function
--
https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155100
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp 2013-03-21 18:53:47 +
+++ src/compiler/expression/expr_clone.cpp 2013-03-23 15:23:24 +
@@ -386,7 +386,6 @@
create_function_item_expr(theSctx,
udf,
get_loc(),
- e-theDynamicFunctionInfo-theClosureSctx,
e-theDynamicFunctionInfo-theFunction,
e-theDynamicFunctionInfo-theFunction-getName(),
e-theDynamicFunctionInfo-theArity,
@@ -394,11 +393,20 @@
e-needs_context_item(),
e-is_coercion());
-std::vectorexpr*::const_iterator varIter = e-theDynamicFunctionInfo-theScopedVarsValues.begin();
-std::vectorvar_expr*::const_iterator substVarIter = e-theDynamicFunctionInfo-theSubstVarsValues.begin();
-std::vectorstore::Item_t::const_iterator nameIter = e-theDynamicFunctionInfo-theScopedVarsNames.begin();
-std::vectorint::const_iterator isGlobalIter = e-theDynamicFunctionInfo-theIsGlobalVar.begin();
-for (; varIter != e-theDynamicFunctionInfo-theScopedVarsValues.end(); ++varIter, ++substVarIter, ++nameIter, ++isGlobalIter)
+std::vectorexpr*::const_iterator varIter =
+e-theDynamicFunctionInfo-theScopedVarsValues.begin();
+
+std::vectorvar_expr*::const_iterator substVarIter =
+e-theDynamicFunctionInfo-theSubstVarsValues.begin();
+
+std::vectorstore::Item_t::const_iterator nameIter =
+e-theDynamicFunctionInfo-theScopedVarsNames.begin();
+
+std::vectorint::const_iterator isGlobalIter =
+e-theDynamicFunctionInfo-theIsGlobalVar.begin();
+
+for (; varIter != e-theDynamicFunctionInfo-theScopedVarsValues.end();
+ ++varIter, ++substVarIter, ++nameIter, ++isGlobalIter)
{
cloneExpr-add_variable((*varIter) ? (*varIter)-clone(udf, subst) : NULL,
(*substVarIter) ? static_castvar_expr*((*substVarIter)-clone(udf, subst)) : NULL,
=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp 2013-03-17 13:44:16 +
+++ src/compiler/expression/expr_manager.cpp 2013-03-23 15:23:24 +
@@ -496,16 +496,6 @@
CREATE_AND_RETURN_EXPR(wrapper_expr, sctx, udf, loc, wrapped);
}
-#if 0
-function_trace_expr* ExprManager::create_function_trace_expr(
-static_context* sctx,
-user_function* udf,
-const QueryLoc loc,
-expr* aChild)
-{
- CREATE_AND_RETURN_EXPR(function_trace_expr, sctx, udf, loc, aChild);
-}
-#endif
function_trace_expr* ExprManager::create_function_trace_expr(
user_function* udf,
@@ -818,30 +808,32 @@
}
-function_item_expr* ExprManager::create_function_item_expr(static_context* sctx,
+function_item_expr* ExprManager::create_function_item_expr(
+static_context* sctx,
user_function* udf,
const QueryLoc loc,
-static_context* closureSctx,
function* f,
-store::Item* aQName,
-uint32_t aArity,
+store::Item* qname,
+uint32_t arity,
bool isInline,
bool needsContextItem,
bool isCoercion)
{
- CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc, closureSctx, f, aQName, aArity, isInline, needsContextItem, isCoercion);
+ CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc,
+ f, qname, arity, isInline, needsContextItem, isCoercion);
}
-function_item_expr* ExprManager::create_function_item_expr(static_context* sctx,
+function_item_expr* ExprManager::create_function_item_expr(
+static_context* sctx,
user_function* udf,
const QueryLoc loc,
-static_context *closureSctx,
bool isInline,
bool needsContextItem,
bool isCoercion)
{
- CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc, closureSctx, isInline, needsContextItem, isCoercion);
+ CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc,
+ isInline, needsContextItem, isCoercion);
}
=== modified file 'src/compiler/expression/expr_manager.h'
--- src/compiler/expression/expr_manager.h 2013-03-17 13:44:16 +
+++ src/compiler/expression/expr_manager.h 2013-03-23 15:23:24 +
@@ -306,14 +306,6 @@
const QueryLoc loc,
expr* wrapped);
-#if 0
- function_trace_expr* create_function_trace_expr(
- static_context* sctx,
- user_function* udf,
- const QueryLoc
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/hof-merge into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155100 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155100 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155100 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-23T15-36-58.877Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155100 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-merge into lp:zorba
Validation queue job hof-merge-2013-03-23T15-36-58.877Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155100 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-merge into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-21T17-54-44.473Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue job hof-merge-2013-03-21T17-54-44.473Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: 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 text conflict in src/compiler/translator/translator.cpp -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-21T00-41-48.09Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue job hof-merge-2013-03-21T00-41-48.09Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge 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 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Nicolae, Matthias, the branch is ready for merge. Please approve asap. -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-17T14-14-42.129Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-17T14-14-42.129Z is finished. The final status was: 13 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-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-15T08-36-41.256Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-15T08-36-41.256Z is finished. The final status was: 14 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-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Commit Message changed to: Implementation of higher order functions. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-13T17-20-31.534Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-13T17-20-31.534Z is finished. The final status was: 2959 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-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-13T20-15-29.629Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-13T20-15-29.629Z is finished. The final status was: 1597 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-merge/+merge/153199 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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-merge into lp:zorba
In translator.cpp:3356 what is the reason for the arity checks for fn:number and fn:static-base-uri functions? -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
Markos, I've fixed the following issues you have reported (with changes merged into this branch): -- Also, the grammar rule for LiteralFunctionItem should use EQNAME, instead of QNAME. I've looked into it and the QNAME production actually covers EQNAMEs. I haven't tested it but they should work, as all the other grammar rules use the QNAME production. -- In typeops.cpp:749, you should not be casting AnyFunctionXQType to FunctionXQType. Fixed. -- is_equal() has not been implemented for function types. If you think it will never be called, then at least put an assertion to make sure that it will indeed never be called. I have implemented it. -- I think we should completely remove the option to enable/disable the HOF feature. I have removed it from the features system. -- There are also several failures in fn-function-lookup and misc-HigherOrderFunctions test sets. Are you aware of these failures? Yes, I'm aware. As I have said in an e-mail, the remaining failures are caused by the function-lookup() which I'm working on. On the other hand, there should be no failures in misc-HigherOrderFunctions, unless there are functions which use the $$context-position or $$context-size. I'll look into this. I will update the test/fots/CMakeLists.txt but it will take a while as FOTS has no progression registration mechanism as the rbkt testdriver has. -- In translator.cpp:3356 what is the reason for the arity checks for fn:number and fn:static-base-uri functions? I've looked into it and also run some tests and seems the checks are indeed redundant. I had copied the arity verification from the FunctionCall end_visit() translation, see e.g. translator.cpp:10875 in the Trunk branch. I have removed those checks. -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
I believe I agree, for what it's worth. I can't think of any reason an end user would want or need to disable hof. -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
I think we should completely remove the option to enable/disable the HOF feature. Matthias, do you agree? Yes, I agree. Matthias -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
1) Nope, the order is correct. It was incorrect before I have reversed them. Here is the judgement from the spec: http://www.w3.org/TR/xquery-30/#id- itemtype-subtype -- Bi is function(Ba_1, Ba_2, ... Ba_N) as Br, Ai is function(Aa_1, Aa_2, ... Aa_M) as Ar, where N (arity of Bi) equals M (arity of Ai); subtype(Ar, Br); for values of I between 1 and N, subtype(Ba_I, Aa_I) ; Note: Function return types are covariant because this rule invokes subtype(Ar, Br) for return types. Function arguments are contravariant because this rule invokes subtype(Ba_I, Aa_I) for arguments. -- Yes, you are right, my bad. Actually the rules make sense. Now here are 2 more comments: 1. In typeops.cpp:749, you should not be casting AnyFunctionXQType to FunctionXQType. 2. is_equal() has not been implemented for function types. If you think it will never be called, then at least put an assertion to make sure that it will indeed never be called. -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
In typeimpl.cpp:1167, I think that the order of the 2 args passed to TypeOps::is_subtype() should be reversed. Also, the grammar rule for LiteralFunctionItem should use EQNAME, instead of QNAME. -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-merge-2013-03-08T16-29-29.9Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-merge 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-merge-2013-03-08T16-29-29.9Z is finished. The final status was: 1 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-merge/+merge/151673 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-merge into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-merge into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
1) Nope, the order is correct. It was incorrect before I have reversed them. Here is the judgement from the spec: http://www.w3.org/TR/xquery-30/#id-itemtype-subtype -- Bi is function(Ba_1, Ba_2, ... Ba_N) as Br, Ai is function(Aa_1, Aa_2, ... Aa_M) as Ar, where N (arity of Bi) equals M (arity of Ai); subtype(Ar, Br); for values of I between 1 and N, subtype(Ba_I, Aa_I) ; Note: Function return types are covariant because this rule invokes subtype(Ar, Br) for return types. Function arguments are contravariant because this rule invokes subtype(Ba_I, Aa_I) for arguments. -- The QNAME should indeed be an EQNAME. I'll change it. There 1 test failure the remote queue reports seems to be random -- I've also seen various Excel tests failing randomly on the /hof branch. I've checked for memory errors with valgrind and there were none. https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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-merge into lp:zorba
Markos, I have moved it. -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/151673 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
