[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-empty_selectors into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-empty_selectors into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615 -- https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/feature-empty_selectors into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-empty_selectors 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 feature-empty_selectors-2013-03-15T19-32-56.975Z 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/feature-empty_selectors/+merge/153615 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/feature-empty_selectors into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/feature-empty_selectors into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-empty_selectors-2013-03-15T19-32-56.975Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/feature-empty_selectors into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-empty_selectors into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615 -- https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/feature-empty_selectors into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/feature-empty_selectors into lp:zorba.
Commit message:
- $array() => jn:members($array)
- $object() => jn:keys($object)
- fixed implicit iteration of object/array selectors if type is not statically
known
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615
--
https://code.launchpad.net/~zorba-coders/zorba/feature-empty_selectors/+merge/153615
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-03-06 10:37:33 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-03-15 19:32:31 +
@@ -909,6 +909,8 @@
extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0020;
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0021;
+
extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNDY0021;
#endif
=== modified file 'modules/org/jsoniq/www/pregenerated/errors.xq'
--- modules/org/jsoniq/www/pregenerated/errors.xq 2013-03-06 00:18:36 +
+++ modules/org/jsoniq/www/pregenerated/errors.xq 2013-03-15 19:32:31 +
@@ -157,6 +157,11 @@
declare variable $jerr:JNTY0020 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0020");
(:~
+ :array or object selector on heterogeneous sequence
+:)
+declare variable $jerr:JNTY0021 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0021");
+
+(:~
:parser error raised by jn:parse-json
:)
declare variable $jerr:JNDY0021 as xs:QName := fn:QName($jerr:NS, "jerr:JNDY0021");
\ No newline at end of file
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-08 00:09:46 +
+++ src/compiler/translator/translator.cpp 2013-03-15 19:32:31 +
@@ -11432,7 +11432,7 @@
if (!theSctx->is_feature_set(feature::hof) ||
(TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ITEM_TYPE_STAR)))
{
-if (numArgs != 1)
+if (numArgs > 1)
{
RAISE_ERROR_NO_PARAMS(jerr::JNTY0018, loc);
}
@@ -11448,22 +11448,27 @@
if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ARRAY_TYPE_STAR))
{
- func = BUILTIN_FUNC(FN_JSONIQ_MEMBER_2);
+ func = numArgs==1 ?
+BUILTIN_FUNC(FN_JSONIQ_MEMBER_2) :
+BUILTIN_FUNC(FN_JSONIQ_MEMBERS_1);
}
else if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_OBJECT_TYPE_STAR))
{
- func = BUILTIN_FUNC(FN_JSONIQ_VALUE_2);
+ func = numArgs==1 ?
+BUILTIN_FUNC(FN_JSONIQ_VALUE_2) :
+BUILTIN_FUNC(FN_JSONIQ_KEYS_1);
}
else
{
- func = BUILTIN_FUNC(OP_ZORBA_JSON_ITEM_ACCESSOR_2);
+ func = numArgs==1 ?
+BUILTIN_FUNC(OP_ZORBA_JSON_ITEM_ACCESSOR_2) :
+BUILTIN_FUNC(OP_ZORBA_JSON_ITEM_ACCESSOR_1);
}
-
-accessorExpr = theExprManager->create_fo_expr(theRootSctx, theUDF,
- loc,
- func,
- flworVarExpr,
- arguments[0]);
+accessorExpr = numArgs==1 ?
+ theExprManager->create_fo_expr(
+ theRootSctx, theUDF, loc, func, flworVarExpr, arguments[0]) :
+ theExprManager->create_fo_expr(
+ theRootSctx, theUDF, loc, func, flworVarExpr);
normalize_fo(accessorExpr);
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-03-07 10:10:10 +
+++ src/diagnostics/diagnostic_en.xml 2013-03-15 19:32:31 +
@@ -3095,7 +3095,7 @@
It is a dynamic error if there is not exactly one supplied parameter for an object or array selector.
- object or array selection needs exactly one parameter
+ object or array selection needs zero or one parameter
@@ -3120,6 +3120,11 @@
$1: invalid option type for option $2 (expected $3)
+
+ array or object selector on heterogeneous sequence
+ $1: invalid json-item() type (expected $2)
+
+
parser error raised by jn:parse-json
$1
=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp 2013-03-06 10:37:33 +
+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2013-03-15 19:32:31 +
@@ -1339,6 +1339,9 @@
JSONiqErrorCode JNTY0020( "JNTY0020" );
+JSONiqErrorCode JNTY0021( "JNTY0021" );
+
+
JSONiqErrorCode JNDY0021( "JNDY0021" );
#endif
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-03-07 10:10:10 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-03-15 19:32:31 +
@@ -126,12 +126,15 @@
{ "JNTY0011", "JSON item cannot appear in content sequence of node constructor or updating expression" },
#endif
#if defined(ZORBA_WITH_JSON)
- { "JNTY0018", "object or array se
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Review: Needs Fixing Only 7 of the failures were fixed (as you can see from the changes in 'test/fots/CMakeLists.txt'). There are 8 more failures and, from what I've seen all check the behaviour of the fn:nilled in XQuery 1.1 (please see that there is a XQ10 dependency for these tests). This is the http://www.w3.org/TR/2009/WD-xpath-functions-11-20091215/#func-nilled";>fn:nilled spec in XQuery 1.1 and this in the http://www.w3.org/TR/xpath-functions-30/#func-nilled";>fn:nilled spec in XQuery 3.0. -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[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
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
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
[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
