Merge branch 'pavlopoulou/newjsonparser' into pavlopoulou/newmaster/jsonparser
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/6c7dd292 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/6c7dd292 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/6c7dd292 Branch: refs/heads/master Commit: 6c7dd2924d26e091d261a4e8729b1c46dfc83599 Parents: 2b59326 2410db8 Author: Christina Pavlopoulou <[email protected]> Authored: Wed May 25 14:24:30 2016 -0700 Committer: Christina Pavlopoulou <[email protected]> Committed: Wed May 25 14:24:30 2016 -0700 ---------------------------------------------------------------------- .../org/apache/vxquery/xmlquery/ast/ASTTag.java | 92 +++++++++++++++++++- .../xmlquery/ast/ArrayConstructorNode.java | 27 ++++++ vxquery-core/src/main/javacc/xquery-grammar.jj | 42 +++++++++ 3 files changed, 160 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
