Merge branch 'riyafa/VXQUERY-211'
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/2db20490 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/2db20490 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/2db20490 Branch: refs/heads/master Commit: 2db20490c4d934fcee821ef923256f0f7ea26747 Parents: 479ed71 f6d6a86 Author: Preston Carman <[email protected]> Authored: Thu Jul 7 18:06:31 2016 -0700 Committer: Preston Carman <[email protected]> Committed: Thu Jul 7 18:06:31 2016 -0700 ---------------------------------------------------------------------- .../ObjectConstructorScalarEvaluator.java | 66 ++++++++++++++------ .../vxquery/xmlquery/ast/PairConstructor.java | 12 +++- .../xmlquery/translator/XMLQueryTranslator.java | 10 ++- vxquery-core/src/main/javacc/xquery-grammar.jj | 4 +- .../Json/Object/q12_object.txt | 1 + .../Queries/XQuery/Json/Object/q12_object.xq | 29 +++++++++ .../test/resources/cat/JsonObjectQueries.xml | 5 ++ 7 files changed, 102 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
