Fix parser bug with JSON items. Refactor grouping variable ebnf rule according to the latest W3C spec.

2013-02-25 15:56:51 +01:00 · 2013-02-25 15:56:51 +01:00 · 53c83a79d5
commit 53c83a79d5
parent aea9a21bd6
2 changed files with 33493 additions and 33294 deletions
--- a/lib/ace/mode/xquery/XQueryParser.ebnf
+++ b/lib/ace/mode/xquery/XQueryParser.ebnf
@ -177,7 +177,9 @@ GroupByClause
 GroupingSpecList
         ::= GroupingSpec ( ',' GroupingSpec )*
 GroupingSpec
-         ::= '$' VarName ( TypeDeclaration? ':=' ExprSingle )? ( 'collation' URILiteral )?
+         ::= GroupingVariable ( TypeDeclaration? ':=' ExprSingle )? ( 'collation' URILiteral )?
+GroupingVariable
+         ::= '$' VarName
 OrderByClause
         ::= ( 'order' 'by' | 'stable' 'order' 'by' ) OrderSpecList
 OrderSpecList
@ -773,6 +775,9 @@ FunctionName
           | 'constraint'
           | 'loop'
           | 'returning'
+           | 'object'
+           | 'json-item'
+           | 'array'
 NCName   ::= NCName^Token
           | 'after'
           | 'and'
--- a/lib/ace/mode/xquery/XQueryParser.js
+++ b/lib/ace/mode/xquery/XQueryParser.js