[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185014 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185014 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185014 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
cleanup + new test
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216
cleanup + new test
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp 2013-05-15 23:22:01 +
+++ src/compiler/expression/expr.cpp 2013-09-12 08:26:43 +
@@ -806,6 +806,9 @@
theInput(input)
{
compute_scripting_kind();
+
+ if (theInput-get_expr_kind() == var_expr_kind)
+static_castvar_expr*(theInput)-add_ref();
}
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-09-12 07:54:03 +
+++ src/compiler/translator/translator.cpp 2013-09-12 08:26:43 +
@@ -1669,13 +1669,10 @@
argVars.push_back(argVar);
expr* arg = CREATE(wrapper)(theRootSctx, theUDF, loc, argVar);
-argVar-add_ref();
arg = normalize_fo_arg(i, arg, inlineUDF.get(), loc);
arguments.push_back(arg);
}
- fiSubstVar-add_ref();
-
expr* body =
CREATE(dynamic_function_invocation)(theRootSctx,
theUDF,
@@ -1938,8 +1935,6 @@
// compute the size of the input seq
expr* varWrapper = CREATE(wrapper)(theRootSctx, theUDF, loc, lcInputVar);
-lcInputVar-add_ref();
-
fo_expr* countExpr = CREATE(fo)(theRootSctx,
theUDF,
loc,
@@ -6617,18 +6612,12 @@
expr* valueExpr = pop_nodestack();
if (varType != NULL)
-valueExpr = theExprManager-create_treat_expr(theRootSctx,
- theUDF,
- loc,
- valueExpr,
- varType,
- TREAT_TYPE_MATCH);
+valueExpr = CREATE(treat)(theRootSctx, theUDF, loc,
+ valueExpr,
+ varType,
+ TREAT_TYPE_MATCH);
- push_nodestack(theExprManager-create_var_set_expr(theRootSctx,
- theUDF,
- loc,
- ve,
- valueExpr));
+ push_nodestack(CREATE(var_set)(theRootSctx, theUDF, loc, ve, valueExpr));
theAssignedVars.back().push_back(ve);
}
@@ -7636,8 +7625,6 @@
inputExpr = CREATE(wrapper)(theRootSctx, theUDF, specLoc, inputExpr);
- var-getVar()-add_ref();
-
inputExpr = wrap_in_atomization(inputExpr);
inputExpr = wrap_in_type_match(inputExpr,
@@ -7687,10 +7674,7 @@
bind_var(ngVar, theSctx);
-expr* inputExpr =
-theExprManager-create_wrapper_expr(theRootSctx, theUDF, loc, inputVar);
-
-inputVar-add_ref();
+expr* inputExpr = CREATE(wrapper)(theRootSctx, theUDF, loc, inputVar);
nongrouping_rebind.push_back(std::pairexpr*, var_expr*(inputExpr, ngVar));
}
@@ -10357,8 +10341,6 @@
relpath_expr* predPathExpr = CREATE(relpath)(theRootSctx, theUDF, loc);
predPathExpr-add_back(CREATE(wrapper)(theRootSctx, theUDF, loc, fcOuterDot-get_var()));
- fcOuterDot-get_var()-add_ref();
-
predPathExpr-add_back(axisExpr);
expr* predInputExpr = predPathExpr;
@@ -11331,8 +11313,6 @@
throw;
}
- ve-add_ref();
-
if (ve-get_kind() == var_expr::prolog_var)
{
TypeManager* tm = CTX_TM;
@@ -11405,8 +11385,6 @@
}
}
- dotVar-add_ref();
-
return CREATE(wrapper)(theRootSctx, theUDF, loc, dotVar);
}
@@ -11426,8 +11404,6 @@
}
}
- posVar-add_ref();
-
return CREATE(wrapper)(theRootSctx, theUDF, loc, posVar);
}
@@ -11447,8 +11423,6 @@
}
}
- sizeVar-add_ref();
-
return CREATE(wrapper)(theRootSctx, theUDF, loc, sizeVar);
}
@@ -12353,8 +12327,6 @@
std::vectorexpr* fncall_args;
fncall_args.push_back(CREATE(wrapper)(theRootSctx, theUDF, loc, seq_fc-get_var()));
-seq_fc-get_var()-add_ref();
-
expr* dynamic_fncall =
CREATE(dynamic_function_invocation)(theRootSctx, theUDF, loc,
arguments[1],
@@ -12384,8 +12356,6 @@
std::vectorexpr* fncall_args;
fncall_args.push_back(CREATE(wrapper)(theRootSctx, theUDF, loc, seq_fc-get_var()));
-seq_fc-get_var()-add_ref();
-
expr* dynamic_fncall =
CREATE(dynamic_function_invocation)(theRootSctx, theUDF, loc,
arguments[1],
@@ -12568,8 +12538,6 @@
sourceExpr = CREATE(wrapper)(theRootSctx, theUDF, loc, fc-get_var());
-
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185216 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Merged = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Commit Message changed to: Regenerating pregenerated parser and scanner files (last bug fix was not reflected). For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/183640 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
fixed bug #1223313
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228
fixed bug #1223313
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-09-12 08:25:47 +
+++ src/compiler/translator/translator.cpp 2013-09-12 09:55:43 +
@@ -10870,8 +10870,6 @@
{
accessorExpr =
generate_fn_body(BUILTIN_FUNC(OP_ZORBA_MULTI_ARRAY_LOOKUP_2), args, loc);
-
- pop_scope();
}
else
{
@@ -10879,6 +10877,8 @@
generate_fn_body(BUILTIN_FUNC(OP_ZORBA_SINGLE_ARRAY_LOOKUP_2), args, loc);
}
+pop_scope();
+
push_nodestack(accessorExpr);
return;
=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/member_05.xml.res'
=== added file 'test/rbkt/Queries/zorba/jsoniq/member_05.xq'
--- test/rbkt/Queries/zorba/jsoniq/member_05.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/jsoniq/member_05.xq 2013-09-12 09:55:43 +
@@ -0,0 +1,1 @@
+()[[1]][[1]]
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq-update into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/177/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq-update into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq-update into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 :
Votes: {'Pending': 1, 'Needs commit message': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq-update into lp:zorba
Review: Approve Looks great. I'll approve and let you decide on one question: Is it really necessary to make the expressions in the parsenodes non-const? Couldn't you use a unique pointer or auto_ptr in the parser that is passed to convert_postfix_to_target_and_selector and only released when the JSON expression is created? -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
